Changeset 3e828ea in mainline for boot/arch/mips32/src/main.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• boot/arch/mips32/src/main.c (modified) (2 diffs)

boot/arch/mips32/src/main.c

@@ -45 +45 @@
 static uint32_t *cpumap = (uint32_t *) PA2KA(CPUMAP_OFFSET);
 
-void bootstrap(void)
+void bootstrap(int kargc, char **kargv)
 {
         version_print();
@@ -79 +79 @@
         }
 
+        str_cpy(bootinfo->bootargs, sizeof(bootinfo->bootargs),
+            (kargc > 1) ? kargv[1] : "");
+
         uintptr_t entry = check_kernel(kernel_start);