mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 13:34:27 -04:00
dceb5938f8
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.29 Removed upstreamed: generic/backport-6.6/740-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch[1] generic/backport-6.6/740-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch[2] generic/backport-6.6/790-29-v6.9-net-dsa-mt7530-fix-improper-frames-on-all-25MHz-and-.patch[3] generic/backport-6.6/790-31-v6.10-net-dsa-mt7530-fix-enabling-EEE-on-MT7531-switch-on-.patch[4] generic/backport-6.6/790-34-v6.10-net-dsa-mt7530-fix-mirroring-frames-received-on-loca.patch[5] generic/backport-6.6/790-35-v6.10-net-dsa-mt7530-fix-port-mirroring-for-MT7988-SoC-swi.patch[6] mediatek/patches-6.6/963-net-ethernet-mtk_eth_soc-fix-WED-wifi-reset.patch[7] Manually rebased: generic/backport-6.6/790-23-v6.9-net-dsa-mt7530-get-rid-of-priv-info-cpu_port_config.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=a2471d271042ea18e8a6babc132a8716bb2f08b9 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=4ed82dd368ad883dc4284292937b882f044e625d 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=21b9d89d93422221cdda1b82fd075fa3c94a11d9 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=bd41ee1efd478852a0882ce5f136bc2b5e83eff2 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=d1be3960539249a8690ed09a29d0e3bf34189dd2 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=f8de1b6208bf71bd3102548d33dd8475573ad2ea 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.29&id=6855f724f19620c3ddff57c349e0abba797475b1 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
72 lines
1.8 KiB
Diff
72 lines
1.8 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
|
|
@@ -1811,6 +1811,15 @@ config DEBUG_RSEQ
|
|
|
|
If unsure, say N.
|
|
|
|
+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
|
|
@@ -609,6 +609,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
|
|
@@ -898,6 +921,7 @@ void start_kernel(void)
|
|
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();
|