Changeset bd250b0f in mainline

Timestamp:

2012-06-29T14:37:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

00006e0

Parents:

ea150dc6

Message:

Fix ia32/amd64 essential build.

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (2 diffs)
• arch/ppc32/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -114 +114 @@
         $(USPACE_PATH)/srv/devman/devman
 
-RD_DRVS = \
-        infrastructure/root \
+RD_DRVS_ESSENTIAL = \
+        infrastructure/root
+
+RD_DRVS_NON_ESSENTIAL = \
         infrastructure/rootvirt \
         test/test1 \
@@ -222 +224 @@
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
+RD_DRVS = $(RD_DRVS_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
+RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTAIL)
 endif
 

boot/arch/amd64/Makefile.inc

@@ -28 +28 @@
 
 RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/hw/irc/apic/apic \
         $(USPACE_PATH)/srv/hw/irc/i8259/i8259
@@ -34 +35 @@
         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
 
-RD_DRVS += \
-        audio/sb16 \
-        char/ns8250 \
+RD_DRVS_ESSENTIAL += \
         infrastructure/rootpc \
         bus/pci/pciintel \
         bus/isa \
         char/i8042 \
+        char/ps2mouse \
+        char/xtkbd
+
+RD_DRVS_NON_ESSENTIAL += \
+        audio/sb16 \
         char/ns8250 \
-        char/ps2mouse \
-        char/xtkbd \
         bus/usb/ehci\
         bus/usb/ohci \

boot/arch/ppc32/Makefile.inc

@@ -42 +42 @@
         $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
 
-RD_DRVS += \
+RD_DRVS_NON_ESSENTIAL += \
         infrastructure/rootmac