Changeset 03362fbd in mainline for kernel/genarch/src/multiboot/multiboot2.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/genarch/src/multiboot/multiboot2.c (modified) (1 diff)

kernel/genarch/src/multiboot/multiboot2.c

@@ -49 +49 @@
                 multiboot_extract_command(init.tasks[init.cnt].name,
                     CONFIG_TASK_NAME_BUFLEN, module->string);
+                multiboot_extract_argument(init.tasks[init.cnt].arguments,
+                    CONFIG_TASK_ARGUMENTS_BUFLEN, module->string);
                 
                 init.cnt++;