Changeset 25eec4e in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/arch/arm32/Makefile.inc (modified) (3 diffs)

kernel/arch/arm32/Makefile.inc

@@ -33 +33 @@
 ATSIGN = %
 
-GCC_CFLAGS += -march=armv4 -fno-omit-frame-pointer -mapcs-frame
+GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
+
+ifeq ($(CONFIG_FPU),y)
+# This is necessary to allow vmsr insn and fpexc manipulation
+# Use vfp32 to allow context save/restore of d16-d31 regs.
+AFLAGS += -mfloat-abi=hard -mfpu=vfp3
+endif
 
 BITS = 32
@@ -62 +68 @@
         arch/$(KARCH)/src/ras.c
 
+ifeq ($(CONFIG_FPU),y)
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu.s
+endif
+
 ifeq ($(MACHINE),gta02)
         ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
-endif
-
-ifeq ($(MACHINE),testarm)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
 endif
 
@@ -74 +81 @@
 endif
 
+ifeq ($(MACHINE),beagleboardxm)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/beagleboardxm/beagleboardxm.c
+endif
+
+ifeq ($(MACHINE),beaglebone)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
+endif
+
 ifeq ($(CONFIG_PL050),y)
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c