Changeset c6588ce in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2012-05-05T08:12:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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

@@ -39 +39 @@
 BITS = 32
 ENDIANESS = LE
+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 += \
@@ -49 +50 @@
 SOURCES = \
         arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/eabi.S \
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/mm.c \