Changeset 646b996 in mainline for kernel/arch/arm32/src/arm32.c

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/src/arm32.c (modified) (2 diffs)

kernel/arch/arm32/src/arm32.c

@@ -41 +41 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <arch/machine.h>
 #include <print.h>
 #include <config.h>
@@ -50 +49 @@
 #include <string.h>
 
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
+
+
 /** Performs arm32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)