Changeset b26396e in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2012-12-29T22:16:16Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26e550c2

Parents:

ce60be1 (diff), b55877d (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:

Mainline changes

File:

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

kernel/arch/arm32/Makefile.inc

@@ -52 +52 @@
         arch/$(KARCH)/src/machine_func.c \
         arch/$(KARCH)/src/context.S \
-        arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/dummy.S \
         arch/$(KARCH)/src/cpu/cpu.c \
@@ -69 +68 @@
         arch/$(KARCH)/src/ras.c
 
+ifeq ($(CONFIG_FPU),y)
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
+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