Changeset 03362fbd in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

kernel/arch/arm32/src/machine_func.c

@@ -41 +41 @@
 #include <arch/mach/gta02/gta02.h>
 #include <arch/mach/integratorcp/integratorcp.h>
-#include <arch/mach/testarm/testarm.h>
+#include <arch/mach/beagleboardxm/beagleboardxm.h>
 
 /** Pointer to machine_ops structure being used. */
@@ -51 +51 @@
 #if defined(MACHINE_gta02)
         machine_ops = &gta02_machine_ops;
-#elif defined(MACHINE_testarm)
-        machine_ops = &gxemul_machine_ops;
 #elif defined(MACHINE_integratorcp)
         machine_ops = &icp_machine_ops;
+#elif defined(MACHINE_beagleboardxm)
+        machine_ops = &bbxm_machine_ops;
 #else
 #error Machine type not defined.
@@ -131 +131 @@
 }
 
+const char * machine_get_platform_name(void)
+{
+        if (machine_ops->machine_get_platform_name)
+                return machine_ops->machine_get_platform_name();
+        return NULL;
+}
 /** @}
  */