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>

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 (file)
index 0000000..27d4d7f
--- /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 (file)
index 0000000..3cc032f
--- /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

diff --git a/target/linux/ipq40xx/patches-5.10/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-5.10/997-device_tree_cmdline.patch
deleted file mode 100644 (file)
index 27d4d7f..0000000
--- a/target/linux/ipq40xx/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 is meant to be a default in case nothing else

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 830a14924c971c86c9813083c1578c9b43c63d93..dba917872c0c988c8955553606faca96e0e9b906 100644 (file)
--- 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
        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)
        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
  
 +    /* 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 (file)
index bdcba2a..0000000
--- 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

diff --git a/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
index 652e8ee6c3a028a03ff84f03fc7b4296766c1ad0..a2fd800ced1aa5526fa1b037f8c1fc858f1abe9f 100644 (file)
--- a/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
+++ b/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
@@ -17,9 +17,9 @@
        help
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
        help
 --- 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)
        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
  
 +    /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
 +     * device tree option of chosen/bootargs-override. This is