Changeset 850235d in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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/arm32/Makefile.inc (modified) (2 diffs)

boot/arch/arm32/Makefile.inc

@@ -30 +30 @@
         BOOT_OUTPUT = image.boot
         POST_OUTPUT = $(ROOT_PATH)/uImage.bin
+        LADDR = 0x30008000
+        SADDR = 0x30008000
+        POSTBUILD = Makefile.uboot
+endif
+
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
+        BOOT_OUTPUT = image.boot
+        POST_OUTPUT = $(ROOT_PATH)/uImage.bin
+        LADDR = 0x80000000
+        SADDR = 0x80000000
         POSTBUILD = Makefile.uboot
 endif
@@ -39 +49 @@
 BITS = 32
 ENDIANESS = LE
-EXTRA_CFLAGS = -march=armv4
+EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
 
+ifeq ($(MACHINE), gta02)
 RD_SRVS_ESSENTIAL += \
         $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+endif
 
-RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
+RD_DRVS += \
+        infrastructure/rootamdm37x \
+        fb/amdm37x_dispc \
+        bus/usb/ehci \
+        bus/usb/ohci \
+        bus/usb/usbflbk \
+        bus/usb/usbhub \
+        bus/usb/usbhid \
+        bus/usb/usbmast \
+        bus/usb/usbmid
 
 SOURCES = \