Changeset cefb126 in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

• kernel/arch/arm32/src/arm32.c (modified) (2 diffs)

kernel/arch/arm32/src/arm32.c

@@ -45 +45 @@
 #include <interrupt.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <userspace.h>
 #include <macros.h>
 #include <str.h>
 #include <arch/ras.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. */
@@ -71 +63 @@
                     bootinfo->tasks[i].name);
         }
+
+        /* Initialize machine_ops pointer. */
+        machine_ops_init();
 }