mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-07 05:04:00 -05:00
be6753dda0
Manually rebuild pending patches: - 103-kbuild-export-SUBARCH.patch - 141-jffs2-add-RENAME_EXCHANGE-support.patch - 200-ARM-9404-1-arm32-fix-boot-hang-with-HAVE_LD_DEAD_COD.patch - 203-kallsyms_uncompressed.patch - 270-platform-mikrotik-build-bits.patch - 308-mips32r2_tune.patch - 330-MIPS-kexec-Accept-command-line-parameters-from-users.patch - 402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch - 451-block-partitions-populate-fwnode.patch - 476-mtd-spi-nor-add-eon-en25q128.patch - 477-mtd-spi-nor-add-eon-en25qx128a.patch - 479-mtd-spi-nor-add-xtx-xt25f128b.patch - 481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch - 482-mtd-spi-nor-add-gd25q512.patch - 484-mtd-spi-nor-add-esmt-f25l16pa.patch - 485-mtd-spi-nor-add-xmc-xm25qh128c.patch - 488-mtd-spi-nor-add-xmc-xm25qh64c.patch - 490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch - 497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch - 498-mtd-spi-nor-locking-support-for-MX25L6405D.patch - 510-block-add-uImage.FIT-subimage-block-driver.patch - 530-jffs2_make_lzma_available.patch - 630-packet_socket_type.patch - 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch - 681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch - 700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch - 702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch - 706-net-phy-populate-host_interfaces-when-attaching-PHY.patch - 711-03-net-dsa-qca8k-add-support-for-port_change_master.patch - 734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch - 736-03-net-ethernet-mtk_eth_soc-improve-keeping-track-of-of.patch - 737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch - 739-03-net-pcs-pcs-mtk-lynxi-add-platform-driver-for-MT7988.patch - 801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch - 809-01-nvmem-core-generalize-mac-base-cells-handling.patch - 811-pci_disable_usb_common_quirks.patch - 834-ledtrig-libata.patch - 892-leds-Add-LED1202-I2C-driver.patch - 920-mangle_bootargs.patch Co-authored-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> [ improve commit title + minor fixes ] Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
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
|
|
@@ -1884,6 +1884,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS
|
|
config ARCH_HAS_MEMBARRIER_SYNC_CORE
|
|
bool
|
|
|
|
+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
|
|
@@ -621,6 +621,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
|
|
@@ -927,6 +950,7 @@ void start_kernel(void)
|
|
jump_label_init();
|
|
static_call_init();
|
|
early_security_init();
|
|
+ mangle_bootargs(command_line);
|
|
setup_boot_config();
|
|
setup_command_line(command_line);
|
|
setup_nr_cpu_ids();
|