aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-05-30 16:00:42 +0000
committerJohn Crispin <john@openwrt.org>2013-05-30 16:00:42 +0000
commita9968d9cb8cb10030491fa05e24b00bd42f6d3a9 (patch)
tree763f23f8d0eff44d897b3077ef61ec97c2469269 /target/linux/generic/patches-3.10
parentd1f3751d057374a715f1702ad4edfe7aa4065b12 (diff)
downloadupstream-a9968d9cb8cb10030491fa05e24b00bd42f6d3a9.tar.gz
upstream-a9968d9cb8cb10030491fa05e24b00bd42f6d3a9.tar.bz2
upstream-a9968d9cb8cb10030491fa05e24b00bd42f6d3a9.zip
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
Diffstat (limited to 'target/linux/generic/patches-3.10')
-rw-r--r--target/linux/generic/patches-3.10/997-device_tree_cmdline.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch
new file mode 100644
index 0000000000..8009a297f1
--- /dev/null
+++ b/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -677,6 +677,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