mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
7181eb9f81
Remove upstreamed patches: - 000-v5.18-01-dt-bindings-reset-add-dt-binding-header-for-Mediatek.patch - 000-v5.18-02-staging-mt7621-dts-align-resets-with-binding-documen.patch - 001-v5.18-01-dt-bindings-clock-mediatek-mt7621-sysc-add-reset-cel.patch - 001-v5.18-02-clk-ralink-make-system-controller-node-a-reset-provi.patch - 002-v6.0-MIPS-ralink-mt7621-avoid-to-init-common-ralink-reset.patch - 100-v5.16-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch - 101-v5.17-PCI-mt7621-Rename-mt7621_pci_-to-mt7621_pcie_.patch - 102-v5.17-PCI-mt7621-Declare-mt7621_pci_ops-static.patch - 103-v5.17-PCI-mt7621-Move-MIPS-setup-to-pcibios_root_bridge_pr.patch - 104-v5.17-PCI-mt7621-Drop-of_match_ptr-to-avoid-unused-variabl.patch - 105-v5.17-PCI-mt7621-Remove-unused-function-pcie_rmw.patch - 106-v5.17-PCI-Let-pcibios_root_bridge_prepare-access-bridge-wi.patch - 107-v6.2-PCI-mt7621-Add-sentinel-to-quirks-table.patch - 108-v6.3-PCI-mt7621-Delay-phy-ports-initialization.patch Manually refresh: - 006-v6.5-mips-ralink-introduce-commonly-used-remap-node-funct.patch - 320-MIPS-add-support-for-buggy-MT7621S-core-detection.patch - 405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch - 410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch - 805-pinctrl-AW9523.patch - 825-i2c-MIPS-adds-ralink-I2C-driver.patch - 830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch Automatically refresh: - 200-add-ralink-eth.patch - 314-MIPS-add-bootargs-override-property.patch - 315-owrt-hack-fix-mt7688-cache-issue.patch - 700-net-ethernet-mediatek-support-net-labels.patch - 720-Revert-net-phy-simplify-phy_link_change-arguments.patch - 721-NET-no-auto-carrier-off-support.patch - 800-dmaengine-mediatek-add-HSDMA-support-for-mt7621.patch - 802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch - 810-uvc-add-iPassion-iP2970-support.patch - 821-SPI-ralink-add-Ralink-SoC-spi-driver.patch - 835-asoc-add-mt7620-support.patch - 840-serial-add-ugly-custom-baud-rate-hack.patch - 845-pwm-add-mediatek-support.patch - 850-awake-rt305x-dwc2-controller.patch Tested-by: Andre Heider <a.heider@gmail.com> # netgear,wac124 Tested-by: Andrey Jr. Melnikov <temnota.am@gmail.com> # Xiaomi Mi Router 3G Tested-by: Timo Dorfner <timo.capa@gmail.com> # mt7621/mir3g mt7621/rm2100 Reviewed-by: Shiji Yang <yangshiji66@qq.com> Co-Developed-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Signed-off-by: Nick Hainke <vincent@systemli.org>
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
From f15d27f9c90ede4b16eb37f9ae573ef81c2b6996 Mon Sep 17 00:00:00 2001
|
|
From: David Bauer <mail@david-bauer.net>
|
|
Date: Thu, 31 Dec 2020 18:49:12 +0100
|
|
Subject: [PATCH] MIPS: add bootargs-override property
|
|
|
|
Add support for the bootargs-override property to the chosen node
|
|
similar to the one used on ipq806x or mpc85xx.
|
|
|
|
This is necessary, as the U-Boot used on some boards, notably the
|
|
Ubiquiti UniFi 6 Lite, overwrite the bootargs property of the chosen
|
|
node leading to a kernel panic when loading OpenWrt.
|
|
|
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
---
|
|
arch/mips/kernel/setup.c | 30 ++++++++++++++++++++++++++++++
|
|
1 file changed, 30 insertions(+)
|
|
|
|
--- a/arch/mips/kernel/setup.c
|
|
+++ b/arch/mips/kernel/setup.c
|
|
@@ -557,8 +557,28 @@ static int __init bootcmdline_scan_chose
|
|
|
|
#endif /* CONFIG_OF_EARLY_FLATTREE */
|
|
|
|
+static int __init bootcmdline_scan_chosen_override(unsigned long node, const char *uname,
|
|
+ int depth, void *data)
|
|
+{
|
|
+ bool *dt_bootargs = data;
|
|
+ const char *p;
|
|
+ int l;
|
|
+
|
|
+ if (depth != 1 || !data || strcmp(uname, "chosen") != 0)
|
|
+ return 0;
|
|
+
|
|
+ p = of_get_flat_dt_prop(node, "bootargs-override", &l);
|
|
+ if (p != NULL && l > 0) {
|
|
+ strlcpy(boot_command_line, p, COMMAND_LINE_SIZE);
|
|
+ *dt_bootargs = true;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
static void __init bootcmdline_init(void)
|
|
{
|
|
+ bool dt_bootargs_override = false;
|
|
bool dt_bootargs = false;
|
|
|
|
/*
|
|
@@ -572,6 +592,14 @@ static void __init bootcmdline_init(void
|
|
}
|
|
|
|
/*
|
|
+ * If bootargs-override in the chosen node is set, use this as the
|
|
+ * command line
|
|
+ */
|
|
+ of_scan_flat_dt(bootcmdline_scan_chosen_override, &dt_bootargs_override);
|
|
+ if (dt_bootargs_override)
|
|
+ return;
|
|
+
|
|
+ /*
|
|
* If the user specified a built-in command line &
|
|
* MIPS_CMDLINE_BUILTIN_EXTEND, then the built-in command line is
|
|
* prepended to arguments from the bootloader or DT so we'll copy them
|