openwrt/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch

--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -679,6 +679,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
lantiq: enable retrieving kernel args from bootloader This patch is a device tree enhancement that IMHO is worthy of mainline. It allows the bootloader's commandline to be preserved even when the device tree specifies one. Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> SVN-Revision: 36780 2013-05-30 16:00:42 +00:00			`--- a/drivers/of/fdt.c`
			`+++ b/drivers/of/fdt.c`
kernel: update 3.10 to 3.10.10 Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37890 2013-09-02 19:12:54 +00:00			`@@ -679,6 +679,9 @@ int __init early_init_dt_scan_chosen(uns`
lantiq: enable retrieving kernel args from bootloader This patch is a device tree enhancement that IMHO is worthy of mainline. It allows the bootloader's commandline to be preserved even when the device tree specifies one. Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> SVN-Revision: 36780 2013-05-30 16:00:42 +00:00			`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`