Changeset 6843a9c in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• boot/arch/arm32/Makefile.inc (modified) (2 diffs)

boot/arch/arm32/Makefile.inc

@@ -39 +39 @@
 BITS = 32
 ENDIANESS = LE
-PAGE_SIZE = 4096
+EXTRA_CFLAGS = -march=armv4
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
 
 RD_SRVS_NON_ESSENTIAL += \
@@ -50 +50 @@
 SOURCES = \
         arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/eabi.S \
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/mm.c \