Changeset 8e7c9fe in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2014-09-12T03:45:25Z (11 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/arch/arm32/Makefile.inc (modified) (1 diff)

boot/arch/arm32/Makefile.inc

@@ -60 +60 @@
 
 ifeq ($(MACHINE), gta02)
-RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+                $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+endif
+
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
+        RD_DRVS_ESSENTIAL += \
+                platform/amdm37x \
+                fb/amdm37x_dispc
+endif
+
+ifeq ($(MACHINE), integratorcp)
+        RD_DRVS_ESSENTIAL += \
+                char/pl050 \
+                char/xtkbd \
+                char/ps2mouse \
+                platform/icp
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hw/irc/icp-ic/icp-ic
 endif
 
 RD_DRVS_ESSENTIAL += \
-        infrastructure/rootamdm37x \
-        fb/amdm37x_dispc \
         bus/usb/ehci \
         bus/usb/ohci \