openwrtv3/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch

13 lines
458 B
Diff
Raw Normal View History

--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -817,6 +817,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(strlen(data) + (int)l, COMMAND_LINE_SIZE));
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else