Changeset 3b2e387 in mainline for boot


Ignore:
Timestamp:
2011-06-21T19:36:05Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e3a6c45
Parents:
40f606b (diff), 022d9f67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge input server, console and various other improvements

Location:
boot/arch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/amd64/Makefile.inc

    r40f606b r3b2e387  
    3535
    3636RD_SRVS_NON_ESSENTIAL += \
    37         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
    38         $(USPACE_PATH)/srv/hid/char_mouse/char_ms
     37        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
    3938
    4039RD_DRVS += \
  • boot/arch/ppc32/Makefile.inc

    r40f606b r3b2e387  
    4343        $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
    4444
    45 RD_SRVS_NON_ESSENTIAL += \
    46         $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms
    47 
    4845RD_DRVS += \
    4946        infrastructure/rootmac
Note: See TracChangeset for help on using the changeset viewer.