Changeset 646b996 in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2009-07-30T15:58:54Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30885b9

Parents:

76093ae

Message:

cleanup some of the dirty hacks introduced into the arm32 port
add default configurations for the two supported arm32 variants

File:

• kernel/arch/arm32/Makefile.inc (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -61 +61 @@
         arch/$(KARCH)/src/mm/page.c \
         arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/mm/page_fault.c 
-ifeq ($(MACHINE), testarm)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
-else ifeq ($(MACHINE), integratorcp)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
+        arch/$(KARCH)/src/mm/page_fault.c
+
+ifeq ($(MACHINE),testarm)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
 endif
-ifeq ($(CONFIG_PL050), y)
+
+ifeq ($(MACHINE),integratorcp)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
+endif
+
+ifeq ($(CONFIG_PL050),y)
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
 endif