mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
2bda536a3d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.53 Removed upstreamed: bcm53xx/patches-6.1/032-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch[1] bcm53xx/patches-6.1/032-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch[2] bcm53xx/patches-6.1/032-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch[3] bcm53xx/patches-6.1/032-v6.6-0011-ARM-dts-BCM53573-Fix-Tenda-AC9-switch-CPU-port.patch[4] All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.53&id=ee1d740374aa73fb32857685eb05167ad87458cf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.53&id=ab5154ae26c446136827451e907db45d7b92a76f 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.53&id=f5ff6897094fa161be55786cb9e5d5b1bf7a9049 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.53&id=0ef736fec61422794c4a991d46c4ec212b01d8d1 Signed-off-by: John Audia <therealgraysky@proton.me>
72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
From: Imre Kaloz <kaloz@openwrt.org>
|
|
Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
|
|
|
|
Enabling this option renames the bootloader supplied root=
|
|
and rootfstype= variables, which might have to be know but
|
|
would break the automatisms OpenWrt uses.
|
|
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
---
|
|
init/Kconfig | 9 +++++++++
|
|
init/main.c | 24 ++++++++++++++++++++++++
|
|
2 files changed, 33 insertions(+)
|
|
|
|
--- a/init/Kconfig
|
|
+++ b/init/Kconfig
|
|
@@ -1827,6 +1827,15 @@ config EMBEDDED
|
|
an embedded system so certain expert options are available
|
|
for configuration.
|
|
|
|
+config MANGLE_BOOTARGS
|
|
+ bool "Rename offending bootargs"
|
|
+ depends on EXPERT
|
|
+ help
|
|
+ Sometimes the bootloader passed bogus root= and rootfstype=
|
|
+ parameters to the kernel, and while you want to ignore them,
|
|
+ you need to know the values f.e. to support dual firmware
|
|
+ layouts on the flash.
|
|
+
|
|
config HAVE_PERF_EVENTS
|
|
bool
|
|
help
|
|
--- a/init/main.c
|
|
+++ b/init/main.c
|
|
@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
|
|
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
|
#endif
|
|
|
|
+#ifdef CONFIG_MANGLE_BOOTARGS
|
|
+static void __init mangle_bootargs(char *command_line)
|
|
+{
|
|
+ char *rootdev;
|
|
+ char *rootfs;
|
|
+
|
|
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
|
|
+
|
|
+ if (rootdev)
|
|
+ strncpy(rootdev, "mangled_rootblock=", 18);
|
|
+
|
|
+ rootfs = strstr(command_line, "rootfstype");
|
|
+
|
|
+ if (rootfs)
|
|
+ strncpy(rootfs, "mangled_fs", 10);
|
|
+
|
|
+}
|
|
+#else
|
|
+static void __init mangle_bootargs(char *command_line)
|
|
+{
|
|
+}
|
|
+#endif
|
|
+
|
|
/*
|
|
* We need to store the untouched command line for future reference.
|
|
* We also need to store the touched command line since the parameter
|
|
@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
|
|
pr_notice("%s", linux_banner);
|
|
early_security_init();
|
|
setup_arch(&command_line);
|
|
+ mangle_bootargs(command_line);
|
|
setup_boot_config();
|
|
setup_command_line(command_line);
|
|
setup_nr_cpu_ids();
|