74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
24 lines
756 B
Diff
24 lines
756 B
Diff
--- a/drivers/of/fdt.c
|
|
+++ b/drivers/of/fdt.c
|
|
@@ -903,6 +903,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
|
|
@@ -49,6 +49,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;
|
|
|