diff options
| author | Sungbo Eo <mans0n@gorani.run> | 2022-01-05 00:36:13 +0900 |
|---|---|---|
| committer | Sungbo Eo <mans0n@gorani.run> | 2022-01-29 23:50:28 +0900 |
| commit | 81a561b4a64d3d0107e82f49e52d4d0ff1a29719 (patch) | |
| tree | beba362aa7da6e00c36cd9092445c48c17209848 /target/linux/ipq806x | |
| parent | 536a8021c397ff944d235a39fbb1774f8cd08ec7 (diff) | |
| download | upstream-81a561b4a64d3d0107e82f49e52d4d0ff1a29719.tar.gz upstream-81a561b4a64d3d0107e82f49e52d4d0ff1a29719.tar.bz2 upstream-81a561b4a64d3d0107e82f49e52d4d0ff1a29719.zip | |
kernel: move bootargs-append patch to generic
This moves bootargs-append support patch from ipq40xx and ipq806x to
generic. This way we can append additional boot arguments from DTS instead
of only being able to overwrite them.
This is a preparation for kirkwood support of ipTIME NAS1.
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
Diffstat (limited to 'target/linux/ipq806x')
| -rw-r--r-- | target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch | 4 | ||||
| -rw-r--r-- | target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch index 830a14924c..dba917872c 100644 --- a/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch @@ -17,9 +17,9 @@ default "" --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns +@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns if (p != NULL && l > 0) - strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); + strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); + /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different + * device tree option of chosen/bootargs-override. This is diff --git a/target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch b/target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch deleted file mode 100644 index bdcba2a21c..0000000000 --- a/target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/of/fdt.c -+++ b/drivers/of/fdt.c -@@ -1055,6 +1055,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(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_OVERRIDE is used to fallback to a different - * device tree option of chosen/bootargs-override. This is |