diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 13:44:56 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 02:09:48 -0400 |
commit | 817c21ad9a1f00926f080265493923ada3458c63 (patch) | |
tree | 84733af08a403e6f1c1846a2e9a21cf49276660d /arch/powerpc/kernel/prom.c | |
parent | 27f4488872d9ef2a4b9aa2be58fb0789d6c0ba84 (diff) |
powerpc/powernv: Get kernel command line accross OPAL takeover
We stash it in boot_command_line which isn't in BSS and so won't
be overwritten. We then use that as a default cmd_line before
we walk the device-tree.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 174e1e96175e..7b90c564e932 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -712,6 +712,13 @@ void __init early_init_devtree(void *params) | |||
712 | of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL); | 712 | of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL); |
713 | #endif | 713 | #endif |
714 | 714 | ||
715 | /* Pre-initialize the cmd_line with the content of boot_commmand_line, | ||
716 | * which will be empty except when the content of the variable has | ||
717 | * been overriden by a bootloading mechanism. This happens typically | ||
718 | * with HAL takeover | ||
719 | */ | ||
720 | strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE); | ||
721 | |||
715 | /* Retrieve various informations from the /chosen node of the | 722 | /* Retrieve various informations from the /chosen node of the |
716 | * device-tree, including the platform type, initrd location and | 723 | * device-tree, including the platform type, initrd location and |
717 | * size, TCE reserve, and more ... | 724 | * size, TCE reserve, and more ... |