You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
756 B
25 lines
756 B
10 years ago
|
--- a/drivers/of/fdt.c
|
||
|
|
+++ b/drivers/of/fdt.c
|
||
|
|
@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
|
||
|
10 years ago
|
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
||
|
|
if (p != NULL && l > 0)
|
||
|
|
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
|
||
|
|
+ p = of_get_flat_dt_prop(node, "bootargs-append", &l);
|
||
|
|
+ if (p != NULL && l > 0)
|
||
|
|
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
|
||
|
|
|
||
|
|
/*
|
||
|
|
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
||
|
10 years ago
|
--- a/arch/mips/kernel/prom.c
|
||
|
|
+++ b/arch/mips/kernel/prom.c
|
||
|
|
@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
|
||
|
10 years ago
|
|
||
|
|
void __init __dt_setup_arch(void *bph)
|
||
|
|
{
|
||
|
|
+ if (boot_command_line[0] == '\0')
|
||
|
|
+ strcpy(boot_command_line, arcs_cmdline);
|
||
|
|
+
|
||
|
|
if (!early_init_dt_scan(bph))
|
||
|
|
return;
|
||
|
|
|