diff options
| author | John Crispin <blogic@openwrt.org> | 2013-05-30 16:00:42 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-05-30 16:00:42 +0000 |
| commit | 355ed7111e1cbd6ef0783b84f02477739bc43048 (patch) | |
| tree | 4e90bc39c6ba63e7dabad5f4bced16daabdbb23c /target/linux/generic | |
| parent | 319317b7525bf82f95e0f79d813f2d5612af3d25 (diff) | |
| download | upstream-355ed7111e1cbd6ef0783b84f02477739bc43048.tar.gz upstream-355ed7111e1cbd6ef0783b84f02477739bc43048.tar.bz2 upstream-355ed7111e1cbd6ef0783b84f02477739bc43048.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36780 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
3 files changed, 36 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 diff --git a/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..8009a297f1 --- /dev/null +++ b/target/linux/generic/patches-3.8/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 diff --git a/target/linux/generic/patches-3.9/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.9/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..8009a297f1 --- /dev/null +++ b/target/linux/generic/patches-3.9/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 |