Changeset 89c57b6 in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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

@@ -30 +30 @@
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hw/char/i8042/i8042
+        $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
+        $(USPACE_PATH)/srv/hw/irc/apic/apic \
+        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
 
 RD_SRVS_NON_ESSENTIAL += \
         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
-        $(USPACE_PATH)/srv/hw/bus/pci/pci \
         $(USPACE_PATH)/srv/hid/char_mouse/char_ms
+
+RD_DRVS += \
+        rootpc \
+        pciintel \
+        isa \
+        ns8250
+
+RD_DRV_CFG += \
+        isa/isa.dev
 
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso