openwrtv3/target/linux/generic/patches-3.12/997-device_tree_cmdline.patch
Imre Kaloz e72c7e17a4 preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38528
2013-10-24 13:50:11 +00:00

12 lines
458 B
Diff

--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -754,6 +754,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