Changeset ca62f86 in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2013-09-09T17:52:40Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f7bb6d1

Parents:

6ad185d (diff), a1ecb88 (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) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -28 +28 @@
 
 RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/audio/hound/hound \
+        $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/hw/irc/apic/apic \
         $(USPACE_PATH)/srv/hw/irc/i8259/i8259
 
-RD_DRVS += \
+
+RD_DRVS_ESSENTIAL += \
         infrastructure/rootpc \
         block/ata_bd \
         bus/pci/pciintel \
         bus/isa \
+        audio/sb16 \
         char/i8042 \
+        char/ps2mouse \
+        char/xtkbd
+
+RD_DRVS_NON_ESSENTIAL += \
         char/ns8250 \
-        char/ps2mouse \
-        char/xtkbd \
         time/cmos-rtc \
         bus/usb/ehci\
@@ -55 +61 @@
         bus/isa
 
+RD_APPS_ESSENTIAL += \
+        $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/mixerctl/mixerctl \
+        $(USPACE_PATH)/app/wavplay/wavplay \
+        
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img