Changeset 2b95d13 in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2013-03-12T21:07:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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

@@ -35 +35 @@
 endif
 
-ifeq ($(MACHINE), beagleboardxm)
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
         BOOT_OUTPUT = image.boot
         POST_OUTPUT = $(ROOT_PATH)/uImage.bin
@@ -49 +49 @@
 BITS = 32
 ENDIANESS = LE
-EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR)) -mno-unaligned-access
+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_DRVS += \
         infrastructure/rootamdm37x \
+        fb/amdm37x_dispc \
         bus/usb/ehci \
         bus/usb/ohci \