Changeset 03362fbd in mainline for kernel/arch/arm32/src/arm32.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/arm32.c (modified) (2 diffs)

kernel/arch/arm32/src/arm32.c

@@ -49 +49 @@
 #include <str.h>
 #include <arch/ras.h>
+#include <sysinfo/sysinfo.h>
 
 /** Performs arm32-specific initialization before main_bsp() is called. */
@@ -116 +117 @@
 {
         machine_input_init();
+        const char *platform = machine_get_platform_name();
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
 }