Changeset 8e7c9fe in mainline for boot/Makefile.common

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• boot/Makefile.common (modified) (4 diffs)

boot/Makefile.common

@@ -127 +127 @@
 
 RD_DRVS_ESSENTIAL = \
-        infrastructure/root
+        root/root \
+        root/virt \
+        fb/kfb 
 
 RD_DRVS_NON_ESSENTIAL = \
-        infrastructure/rootvirt \
-        fb/kfb \
         test/test1 \
         test/test2 \
@@ -138 +138 @@
         nic/e1k \
         nic/rtl8139 \
+        nic/rtl8169 \
         block/ahci
 
@@ -189 +190 @@
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
+        $(USPACE_PATH)/app/nic/nic \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -216 +218 @@
         $(USPACE_PATH)/app/vdemo/vdemo \
         $(USPACE_PATH)/app/viewer/viewer \
-        $(USPACE_PATH)/app/df/df
-
-ifeq ($(CONFIG_PCC),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/cc/cc \
-        $(USPACE_PATH)/app/ccom/ccom \
-        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
-        $(USPACE_PATH)/app/cpp/cpp
-endif
-
-ifeq ($(CONFIG_BINUTILS),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/binutils/bin/as \
-        $(USPACE_PATH)/app/binutils/bin/ld
-endif
-
-ifeq ($(CONFIG_MSIM),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/msim/msim
-endif
+        $(USPACE_PATH)/app/df/df \
+        $(USPACE_PATH)/app/fontviewer/fontviewer
 
 COMPONENTS = \