Changeset 0ab362c in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2012-11-22T14:36:04Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e32720ff

Parents:

1f7753a (diff), 0f2c80a (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 support for BeagleBoard-xM (armv7).

Most of the changes outside arm arch are pio_* stuff (addition of pio_trace capability, header consolidation)

File:

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

kernel/arch/arm32/src/machine_func.c

@@ -42 +42 @@
 #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. */
@@ -55 +56 @@
 #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 +134 @@
 }
 
+const char * machine_get_platform_name(void)
+{
+        if (machine_ops->machine_get_platform_name)
+                return machine_ops->machine_get_platform_name();
+        return NULL;
+}
 /** @}
  */