kernel: remove a hack that was obsoleted upstream
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
This commit is contained in:
parent
492964e741
commit
2b4e5d478b
2 changed files with 1 additions and 25 deletions
|
@ -1,24 +0,0 @@
|
||||||
--- a/drivers/of/fdt.c
|
|
||||||
+++ b/drivers/of/fdt.c
|
|
||||||
@@ -956,6 +956,9 @@ int __init early_init_dt_scan_chosen(uns
|
|
||||||
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
|
|
||||||
--- a/arch/mips/kernel/prom.c
|
|
||||||
+++ b/arch/mips/kernel/prom.c
|
|
||||||
@@ -51,6 +51,9 @@ void * __init early_init_dt_alloc_memory
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
chosen {
|
chosen {
|
||||||
bootargs-append = "root= console=ttyLTQ0,115200";
|
bootargs = "root= console=ttyLTQ0,115200";
|
||||||
|
|
||||||
leds {
|
leds {
|
||||||
boot = &power_green;
|
boot = &power_green;
|
||||||
|
|
Loading…
Reference in a new issue