diff options
| author | Wojciech Dubowik <Wojciech.Dubowik@westermo.com> | 2022-09-14 12:12:06 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-09-14 16:45:06 +0200 |
| commit | 00643b4584e73949de05ca8c3276a05657ba0d45 (patch) | |
| tree | d531da4006fa7cb2b4c73290edcb4e7696bbee8d /target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch | |
| parent | df59c07fe9e32bd5124871daa400a8c5e2e8d96f (diff) | |
| download | upstream-00643b4584e73949de05ca8c3276a05657ba0d45.tar.gz upstream-00643b4584e73949de05ca8c3276a05657ba0d45.tar.bz2 upstream-00643b4584e73949de05ca8c3276a05657ba0d45.zip | |
mpc85xx: Copy over kernel 5.10 patches and config to 5.15
Split patches for better change visibility.
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@westermo.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [un-dmarc, commit description]
Diffstat (limited to 'target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch new file mode 100644 index 0000000000..c8803d8428 --- /dev/null +++ b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch @@ -0,0 +1,41 @@ +Index: linux-5.15.67/arch/powerpc/Kconfig +=================================================================== +--- linux-5.15.67.orig/arch/powerpc/Kconfig ++++ linux-5.15.67/arch/powerpc/Kconfig +@@ -915,6 +915,14 @@ config CMDLINE_FORCE + + 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 EXTRA_TARGETS + string "Additional default image types" + help +Index: linux-5.15.67/drivers/of/fdt.c +=================================================================== +--- linux-5.15.67.orig/drivers/of/fdt.c ++++ linux-5.15.67/drivers/of/fdt.c +@@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns + 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 ++ * 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 |