Changeset 8ff0bd2 in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 mainline changes

File:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)

boot/arch/amd64/Makefile.inc

@@ -35 +35 @@
 
 RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
-        $(USPACE_PATH)/srv/hid/char_mouse/char_ms
+        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
 
 RD_DRVS += \
-        rootpc \
-        pciintel \
-        isa \
-        ns8250 \
-        ehci_hcd \
-        ohci \
-        uhci_hcd \
-        uhci_rhd \
-        usbflbk \
-        usbhub \
-        usbhid \
-        usbmast \
-        usbmid \
-        usbmouse \
-        vhc
+        infrastructure/rootpc \
+        bus/pci/pciintel \
+        bus/isa \
+        char/ns8250 \
+        bus/usb/ehci\
+        bus/usb/ohci \
+        bus/usb/uhci \
+        bus/usb/uhcirh \
+        bus/usb/usbflbk \
+        bus/usb/usbhub \
+        bus/usb/usbhid \
+        bus/usb/usbmast \
+        bus/usb/usbmid \
+        bus/usb/usbmouse \
+        bus/usb/vhc
 
 RD_DRV_CFG += \
-        isa/isa.dev
+        bus/isa
 
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso