Changeset 99c2c69e in mainline for boot

Timestamp:

2013-09-13T00:36:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

Location:

boot

Files:

• Makefile.common (modified) (4 diffs)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
+        $(USPACE_PATH)/srv/hid/rfb/rfb \
+        $(USPACE_PATH)/srv/net/dhcp/dhcp \
         $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \
@@ -165 +167 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/devctl/devctl \
         $(USPACE_PATH)/app/dltest/dltest \
@@ -194 +197 @@
         $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
+        $(USPACE_PATH)/app/netspeed/netspeed \
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
@@ -205 +209 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo
+        $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/df/df
 
 ifeq ($(CONFIG_PCC),y)

boot/arch/arm32/Makefile.inc

@@ -57 +57 @@
 endif
 
-RD_DRVS += \
+RD_DRVS_ESSENTIAL += \
         infrastructure/rootamdm37x \
         fb/amdm37x_dispc \

boot/arch/mips32/Makefile.inc

@@ -50 +50 @@
 endif
 
+ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
+        RD_DRVS_ESSENTIAL += \
+                infrastructure/rootmalta \
+                block/ata_bd \
+                bus/pci/pciintel \
+                bus/isa \
+                char/i8042 \
+                char/ps2mouse \
+                char/xtkbd
+
+        RD_DRV_CFG += \
+                bus/isa
+endif
 
 SOURCES = \

boot/arch/ppc32/Makefile.inc

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