openwrtv3/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
Rafał Miłecki 1513b39a8c kernel: start working on 3.18 support
This commit:
1) Copies 3.14 patches
2) Drops mainlined stuff
3) Modifies some patches to apply

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43093
2014-10-27 18:14:39 +00:00

12 lines
465 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