i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U-Boot: pass around argv and /chosen/bootargs

Browse Source 
Not really handled correctly yet, but at least they are passed.
This commit is contained in:
François Revol
2013-10-15 22:15:04 +02:00
parent cf7f92c013
commit b55cb439e7
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/start.cpp
+15 -1
View File
@@ -184,6 +184,12 @@ start_raw(int argc, const char **argv)
args.platform.fdt_data = NULL; args.platform.fdt_data = NULL;
args.platform.fdt_size = 0; args.platform.fdt_size = 0;
if (argv) {
// skip the kernel name
args.arguments = ++argv;
args.arguments_count = --argc;
}
// if we get passed a uimage, try to find the third blob only if we do not have FDT data yet // if we get passed a uimage, try to find the third blob only if we do not have FDT data yet
if (gUImage != NULL if (gUImage != NULL
&& !gFDT && !gFDT
@@ -211,7 +217,7 @@ start_raw(int argc, const char **argv)
args.platform.fdt_size = fdt_totalsize(gFDT); args.platform.fdt_size = fdt_totalsize(gFDT);
} }
// if we get passed an FDT, check /chosen for initrd // if we get passed an FDT, check /chosen for initrd and bootargs
if (gFDT != NULL) { if (gFDT != NULL) {
int node = fdt_path_offset(gFDT, "/chosen"); int node = fdt_path_offset(gFDT, "/chosen");
const void *prop; const void *prop;
@@ -231,6 +237,14 @@ start_raw(int argc, const char **argv)
dprintf("Found boot tgz from FDT @ %p, %" B_PRIu32 " bytes\n", dprintf("Found boot tgz from FDT @ %p, %" B_PRIu32 " bytes\n",
args.platform.boot_tgz_data, args.platform.boot_tgz_size); args.platform.boot_tgz_data, args.platform.boot_tgz_size);
} }
prop = fdt_getprop(gFDT, node, "bootargs", &len);
if (prop) {
dprintf("Found bootargs: %s\n", (const char *)prop);
static const char *sArgs[] = { NULL, NULL };
sArgs[0] = (const char *)prop;
args.arguments = sArgs;
args.arguments_count = 1;
}
} }
} }