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/generic | |
| 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/generic')
| -rw-r--r-- | target/linux/generic/hack-5.10/920-device_tree_cmdline.patch | 12 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.4/920-device_tree_cmdline.patch | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch new file mode 100644 index 0000000000..27d4d7f1e5 --- /dev/null +++ b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch @@ -0,0 +1,12 @@ +--- 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 is meant to be a default in case nothing else diff --git a/target/linux/generic/hack-5.4/920-device_tree_cmdline.patch b/target/linux/generic/hack-5.4/920-device_tree_cmdline.patch new file mode 100644 index 0000000000..3cc032fdd2 --- /dev/null +++ b/target/linux/generic/hack-5.4/920-device_tree_cmdline.patch @@ -0,0 +1,12 @@ +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -1059,6 +1059,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 is meant to be a default in case nothing else |