Commit 96ac7f8e authored by Anton Blanchard's avatar Anton Blanchard

ppc64: Add CONFIG_CMDLINE, from ppc32

parent b5e01cf3
......@@ -67,6 +67,11 @@ source drivers/parport/Config.in
if [ "$CONFIG_PPC_ISERIES" != "y" ]; then
bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
bool 'Default bootloader kernel arguments' CONFIG_CMDLINE_BOOL
if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then
string 'Initial kernel command string' CONFIG_CMDLINE "console=ttyS0,9600 console=tty0 root=/dev/sda2"
fi
fi
endmenu
......
......@@ -379,10 +379,15 @@ void parse_cmd_line(unsigned long r3, unsigned long r4, unsigned long r5,
#endif
cmd_line[0] = 0;
#ifdef CONFIG_CMDLINE
strcpy(cmd_line, CONFIG_CMDLINE);
#endif /* CONFIG_CMDLINE */
chosen = find_devices("chosen");
if (chosen != NULL) {
p = get_property(chosen, "bootargs", NULL);
if (p != NULL)
if (p != NULL && p[0] != 0)
strncpy(cmd_line, p, sizeof(cmd_line));
}
cmd_line[sizeof(cmd_line) - 1] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment