aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-5.10
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ipq806x/patches-5.10')
-rw-r--r--target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch4
-rw-r--r--target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch12
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