diff options
| author | Paul Spooren <mail@aparcar.org> | 2021-10-01 11:27:12 -1000 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-10-02 18:15:23 +0200 |
| commit | b48d30521d4d2f90af50b06c7cf95dd6a24acd35 (patch) | |
| tree | 3c574e09fdbf17b1d719ce8096b43506d18fb9e3 /target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch | |
| parent | cac2ca1d4300a52f5d1d4ef603f0cdcc62c1e2e2 (diff) | |
| download | upstream-b48d30521d4d2f90af50b06c7cf95dd6a24acd35.tar.gz upstream-b48d30521d4d2f90af50b06c7cf95dd6a24acd35.tar.bz2 upstream-b48d30521d4d2f90af50b06c7cf95dd6a24acd35.zip | |
ipq806x: remove obsolete Kernel 5.4
With the upgrade to Kernel 5.10 per default the old version is no longer
required to be in tree.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch deleted file mode 100644 index 49cd68b68d..0000000000 --- a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1840,6 +1840,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL - - endchoice - -+config CMDLINE_OVERRIDE -+ bool "Use alternative cmdline from device tree" -+ help -+ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can -+ be used, this is not a good option for kernels that are shared across -+ devices. This setting enables using "chosen/cmdline-override" as the -+ cmdline if it exists in the device tree. -+ - config CMDLINE - string "Default kernel command string" - default "" ---- a/drivers/of/fdt.c -+++ b/drivers/of/fdt.c -@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns - if (p != NULL && l > 0) - strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); - -+ /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different -+ * device tree option of chosen/bootargs-override. This is -+ * helpful on boards where u-boot sets bootargs, and is unable -+ * to be modified. -+ */ -+#ifdef CONFIG_CMDLINE_OVERRIDE -+ p = of_get_flat_dt_prop(node, "bootargs-override", &l); -+ if (p != NULL && l > 0) -+ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); -+#endif -+ - /* - * CONFIG_CMDLINE is meant to be a default in case nothing else - * managed to set the command line, unless CONFIG_CMDLINE_FORCE |