From 3d167ed805a9300e60f8edcccfd740786b67e671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 5 Aug 2020 15:49:03 +0200 Subject: [PATCH 01/45] uhttpd: update to the latest master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 212f836 ubus: rename JSON-RPC format related functions 628341f ubus: use local "blob_buf" in uh_ubus_handle_request_object() 9d663e7 ubus: use BLOBMSG_TYPE_UNSPEC for "params" JSON attribute 77d345e ubus: drop unused "obj" arguments 8d9e1fc ubus: parse "call" method params only for relevant call Signed-off-by: Rafał Miłecki --- package/network/services/uhttpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index a595a7738a..88478927cc 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git -PKG_SOURCE_DATE:=2020-06-03 -PKG_SOURCE_VERSION:=939c281c70ef82929ffcb3cb383fd6fdc40f341b -PKG_MIRROR_HASH:=4cd16ef955fe32ddb579ec79f3d8f636e7100ccecd95be1991e7e4d317090a54 +PKG_SOURCE_DATE:=2020-08-05 +PKG_SOURCE_VERSION:=212f8364d49c1bc27dd8bdc394fc3615ea9b7ba3 +PKG_MIRROR_HASH:=c717924cd075951846cb8ad271f4754db56af53a271ed0afbdc5a2f482e15f97 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC From b7b7c2a6adf96ff8186509fc1bef550c82d5fc26 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Jul 2020 11:12:10 +0200 Subject: [PATCH 02/45] ipq806x: use qcom-ipq8064.dtsi from upstream Though a qcom-ipq8064.dtsi file exists upstream, we still do overwrite it with a full version of our own in the ipq806x target. About half of the contents of our file are upstream content, the other half are local improvements. To prevent us from having a lot of code maintained twice in parallel, this adjusts the target to use the upstream qcom-ipq8064.dtsi. Our local changes are arranged into three patches, the first pulling a commit from upstream, the second doing a few small adjustments, and the third adding all additional stuff. This should get us the best of both worlds. The property "ports-implemented" on sata@29000000 is moved to 2nd-level DTSI files as kernel defines it there as well. While at, rename 080-ARM-dts-qcom-add-gpio-ranges-property.patch to include the kernel version where it's added upstream. Even though this might look more complicated in the first place, the aim is to bring our files closer to upstream, so we can benefit from changes directly and vice-versa. After all, this drop about 650 lines just copied from the upstream DTSI file. Signed-off-by: Adrian Schmutzler --- .../arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 4 + .../arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 4 + .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 1578 ----------------- .../arch/arm/boot/dts/qcom-ipq8065.dtsi | 4 + ...M-dts-qcom-add-gpio-ranges-property.patch} | 2 +- ...s-qcom-add-scm-definition-to-ipq806x.patch | 29 + .../patches-5.4/082-ipq8064-dtsi-tweaks.patch | 130 ++ .../083-ipq8064-dtsi-additions.patch | 992 +++++++++++ 8 files changed, 1164 insertions(+), 1579 deletions(-) delete mode 100644 target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi rename target/linux/ipq806x/patches-5.4/{080-ARM-dts-qcom-add-gpio-ranges-property.patch => 080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch} (99%) create mode 100644 target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch create mode 100644 target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch create mode 100644 target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi index 40cae75746..8d93f5c3ed 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi @@ -25,3 +25,7 @@ &pcie2 { phy-tx0-term-offset = <7>; }; + +&sata { + ports-implemented = <0x1>; +}; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi index 3a2bb6aebc..5d762046af 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi @@ -26,6 +26,10 @@ phy-tx0-term-offset = <0>; }; +&sata { + ports-implemented = <0x1>; +}; + &ss_phy_0 { rx_eq = <2>; tx_deamp_3_5db = <32>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi deleted file mode 100644 index 38d77b6c0b..0000000000 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ /dev/null @@ -1,1578 +0,0 @@ -/dts-v1/; - -#include -#include -#include -#include -#include -#include -#include -#include - -/ { - model = "Qualcomm IPQ8064"; - compatible = "qcom,ipq8064"; - interrupt-parent = <&intc>; - - #address-cells = <1>; - #size-cells = <1>; - memory { device_type = "memory"; reg = <0 0>; }; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu0: cpu@0 { - compatible = "qcom,krait"; - enable-method = "qcom,kpss-acc-v1"; - device_type = "cpu"; - reg = <0>; - next-level-cache = <&L2>; - qcom,acc = <&acpu0_aux>; - qcom,saw = <&saw0>; - clocks = <&kraitcc 0>, <&kraitcc 4>; - clock-names = "cpu", "l2"; - clock-latency = <100000>; - cpu-supply = <&smb208_s2a>; - operating-points-v2 = <&opp_table0>; - voltage-tolerance = <5>; - cooling-min-state = <0>; - cooling-max-state = <10>; - #cooling-cells = <2>; - cpu-idle-states = <&CPU_SPC>; - }; - - cpu1: cpu@1 { - compatible = "qcom,krait"; - enable-method = "qcom,kpss-acc-v1"; - device_type = "cpu"; - reg = <1>; - next-level-cache = <&L2>; - qcom,acc = <&acpu1_aux>; - qcom,saw = <&saw1>; - clocks = <&kraitcc 1>, <&kraitcc 4>; - clock-names = "cpu", "l2"; - clock-latency = <100000>; - cpu-supply = <&smb208_s2b>; - operating-points-v2 = <&opp_table0>; - voltage-tolerance = <5>; - cooling-min-state = <0>; - cooling-max-state = <10>; - #cooling-cells = <2>; - cpu-idle-states = <&CPU_SPC>; - }; - - L2: l2-cache { - compatible = "cache"; - cache-level = <2>; - qcom,saw = <&saw_l2>; - }; - - qcom,l2 { - qcom,l2-rates = <384000000 1000000000 1200000000>; - qcom,l2-cpufreq = <384000000 600000000 1200000000>; - qcom,l2-volt = <1100000 1100000 1150000>; - qcom,l2-supply = <&smb208_s1a>; - }; - - idle-states { - CPU_SPC: spc { - compatible = "qcom,idle-state-spc", - "arm,idle-state"; - status = "disabled"; - entry-latency-us = <400>; - exit-latency-us = <900>; - min-residency-us = <3000>; - }; - }; - }; - - opp_table0: opp_table0 { - compatible = "operating-points-v2-qcom-cpu"; - nvmem-cells = <&speedbin_efuse>; - - opp-384000000 { - opp-hz = /bits/ 64 <384000000>; - opp-microvolt-speed0-pvs0-v0 = <1000000>; - opp-microvolt-speed0-pvs1-v0 = <925000>; - opp-microvolt-speed0-pvs2-v0 = <875000>; - opp-microvolt-speed0-pvs3-v0 = <800000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - opp-600000000 { - opp-hz = /bits/ 64 <600000000>; - opp-microvolt-speed0-pvs0-v0 = <1050000>; - opp-microvolt-speed0-pvs1-v0 = <975000>; - opp-microvolt-speed0-pvs2-v0 = <925000>; - opp-microvolt-speed0-pvs3-v0 = <850000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - opp-800000000 { - opp-hz = /bits/ 64 <800000000>; - opp-microvolt-speed0-pvs0-v0 = <1100000>; - opp-microvolt-speed0-pvs1-v0 = <1025000>; - opp-microvolt-speed0-pvs2-v0 = <995000>; - opp-microvolt-speed0-pvs3-v0 = <900000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - opp-1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt-speed0-pvs0-v0 = <1150000>; - opp-microvolt-speed0-pvs1-v0 = <1075000>; - opp-microvolt-speed0-pvs2-v0 = <1025000>; - opp-microvolt-speed0-pvs3-v0 = <950000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - opp-1200000000 { - opp-hz = /bits/ 64 <1200000000>; - opp-microvolt-speed0-pvs0-v0 = <1200000>; - opp-microvolt-speed0-pvs1-v0 = <1125000>; - opp-microvolt-speed0-pvs2-v0 = <1075000>; - opp-microvolt-speed0-pvs3-v0 = <1000000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - opp-1400000000 { - opp-hz = /bits/ 64 <1400000000>; - opp-microvolt-speed0-pvs0-v0 = <1250000>; - opp-microvolt-speed0-pvs1-v0 = <1175000>; - opp-microvolt-speed0-pvs2-v0 = <1125000>; - opp-microvolt-speed0-pvs3-v0 = <1050000>; - opp-supported-hw = <0x1>; - clock-latency-ns = <100000>; - }; - - }; - - thermal-zones { - tsens_tz_sensor0 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 0>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor1 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 1>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor2 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 2>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor3 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 3>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor4 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 4>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor5 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 5>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor6 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 6>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor7 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 7>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor8 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 8>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor9 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 9>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - - tsens_tz_sensor10 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&tsens 10>; - - trips { - cpu-critical-hi { - temperature = <125000>; - hysteresis = <2000>; - type = "critical_high"; - }; - - cpu-config-hi { - temperature = <105000>; - hysteresis = <2000>; - type = "configurable_hi"; - }; - - cpu-config-lo { - temperature = <95000>; - hysteresis = <2000>; - type = "configurable_lo"; - }; - - cpu-critical-low { - temperature = <0>; - hysteresis = <2000>; - type = "critical_low"; - }; - }; - }; - }; - - cpu-pmu { - compatible = "qcom,krait-pmu"; - interrupts = ; - }; - - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - nss@40000000 { - reg = <0x40000000 0x1000000>; - no-map; - }; - - smem: smem@41000000 { - reg = <0x41000000 0x200000>; - no-map; - }; - }; - - clocks { - cxo_board { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <25000000>; - }; - - pxo_board { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <25000000>; - }; - - sleep_clk: sleep_clk { - compatible = "fixed-clock"; - clock-frequency = <32768>; - #clock-cells = <0>; - }; - }; - - fab-scaling { - compatible = "qcom,fab-scaling"; - clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>; - clock-names = "apps-fab-clk", "ddr-fab-clk"; - fab_freq_high = <533000000>; - fab_freq_nominal = <400000000>; - cpu_freq_threshold = <1000000000>; - }; - - firmware { - scm { - compatible = "qcom,scm-ipq806x"; - }; - }; - - soc: soc { - #address-cells = <1>; - #size-cells = <1>; - ranges; - compatible = "simple-bus"; - - lpass@28100000 { - compatible = "qcom,lpass-cpu"; - status = "disabled"; - clocks = <&lcc AHBIX_CLK>, - <&lcc MI2S_OSR_CLK>, - <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", - "mi2s-osr-clk", - "mi2s-bit-clk"; - interrupts = ; - interrupt-names = "lpass-irq-lpaif"; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - }; - - qfprom: qfprom@700000 { - compatible = "qcom,qfprom", "syscon"; - reg = <0x700000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; - status = "okay"; - tsens_calib: calib@400 { - reg = <0x400 0xb>; - }; - tsens_backup: backup@410 { - reg = <0x410 0xb>; - }; - speedbin_efuse: speedbin@0c0 { - reg = <0x0c0 0x4>; - }; - }; - - rpm: rpm@108000 { - compatible = "qcom,rpm-ipq8064"; - reg = <0x108000 0x1000>; - qcom,ipc = <&l2cc 0x8 2>; - - interrupts = , - , - ; - interrupt-names = "ack", - "err", - "wakeup"; - - clocks = <&gcc RPM_MSG_RAM_H_CLK>; - clock-names = "ram"; - - #address-cells = <1>; - #size-cells = <0>; - - rpmcc: clock-controller { - compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc"; - #clock-cells = <1>; - }; - - regulators { - compatible = "qcom,rpm-smb208-regulators"; - - smb208_s1a: s1a { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1150000>; - - qcom,switch-mode-frequency = <1200000>; - - }; - - smb208_s1b: s1b { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1150000>; - - qcom,switch-mode-frequency = <1200000>; - }; - - smb208_s2a: s2a { - regulator-min-microvolt = < 800000>; - regulator-max-microvolt = <1250000>; - - qcom,switch-mode-frequency = <1200000>; - }; - - smb208_s2b: s2b { - regulator-min-microvolt = < 800000>; - regulator-max-microvolt = <1250000>; - - qcom,switch-mode-frequency = <1200000>; - }; - }; - }; - - rng@1a500000 { - compatible = "qcom,prng"; - reg = <0x1a500000 0x200>; - clocks = <&gcc PRNG_CLK>; - clock-names = "core"; - }; - - qcom_pinmux: pinmux@800000 { - compatible = "qcom,ipq8064-pinctrl"; - reg = <0x800000 0x4000>; - - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - interrupts = ; - - pcie0_pins: pcie0_pinmux { - mux { - pins = "gpio3"; - function = "pcie1_rst"; - drive-strength = <12>; - bias-disable; - }; - }; - - pcie1_pins: pcie1_pinmux { - mux { - pins = "gpio48"; - function = "pcie2_rst"; - drive-strength = <12>; - bias-disable; - }; - }; - - pcie2_pins: pcie2_pinmux { - mux { - pins = "gpio63"; - function = "pcie3_rst"; - drive-strength = <12>; - bias-disable; - output-low; - }; - }; - - i2c4_pins: i2c4_pinmux { - mux { - pins = "gpio12", "gpio13"; - function = "gsbi4"; - drive-strength = <12>; - bias-disable; - }; - }; - - spi_pins: spi_pins { - mux { - pins = "gpio18", "gpio19", "gpio21"; - function = "gsbi5"; - drive-strength = <10>; - bias-none; - }; - }; - - nand_pins: nand_pins { - disable { - pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38"; - function = "nand"; - drive-strength = <10>; - bias-disable; - }; - - pullups { - pins = "gpio39"; - function = "nand"; - drive-strength = <10>; - bias-pull-up; - }; - - hold { - pins = "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; - function = "nand"; - drive-strength = <10>; - bias-bus-hold; - }; - }; - - mdio0_pins: mdio0_pins { - mux { - pins = "gpio0", "gpio1"; - function = "mdio"; - drive-strength = <8>; - bias-disable; - }; - }; - - rgmii2_pins: rgmii2_pins { - mux { - pins = "gpio27", "gpio28", "gpio29", - "gpio30", "gpio31", "gpio32", - "gpio51", "gpio52", "gpio59", - "gpio60", "gpio61", "gpio62"; - function = "rgmii2"; - drive-strength = <8>; - bias-disable; - }; - }; - - leds_pins: leds_pins { - mux { - pins = "gpio7", "gpio8", "gpio9", - "gpio26", "gpio53"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - output-low; - }; - }; - - buttons_pins: buttons_pins { - mux { - pins = "gpio54"; - drive-strength = <2>; - bias-pull-up; - }; - }; - }; - - intc: interrupt-controller@2000000 { - compatible = "qcom,msm-qgic2"; - interrupt-controller; - #interrupt-cells = <3>; - reg = <0x02000000 0x1000>, - <0x02002000 0x1000>; - }; - - timer@200a000 { - compatible = "qcom,kpss-timer", "qcom,msm-timer"; - interrupts = , - , - , - , - ; - reg = <0x0200a000 0x100>; - clock-frequency = <25000000>, - <32768>; - clocks = <&sleep_clk>; - clock-names = "sleep"; - cpu-offset = <0x80000>; - }; - - acpu0_aux: clock-controller@2088000 { - compatible = "qcom,kpss-acc-v1"; - reg = <0x02088000 0x1000>, <0x02008000 0x1000>; - clock-output-names = "acpu0_aux"; - }; - - acpu1_aux: clock-controller@2098000 { - compatible = "qcom,kpss-acc-v1"; - reg = <0x02098000 0x1000>, <0x02008000 0x1000>; - clock-output-names = "acpu1_aux"; - }; - - l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; - reg = <0x2011000 0x1000>; - clock-output-names = "acpu_l2_aux"; - }; - - kraitcc: clock-controller { - compatible = "qcom,krait-cc-v1"; - #clock-cells = <1>; - }; - - saw0: regulator@2089000 { - compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; - reg = <0x02089000 0x1000>, <0x02009000 0x1000>; - regulator; - }; - - saw1: regulator@2099000 { - compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; - reg = <0x02099000 0x1000>, <0x02009000 0x1000>; - regulator; - }; - - saw_l2: regulator@02012000 { - compatible = "qcom,saw2", "syscon"; - reg = <0x02012000 0x1000>; - regulator; - }; - - sic_non_secure: sic-non-secure@12100000 { - compatible = "syscon"; - reg = <0x12100000 0x10000>; - }; - - gsbi2: gsbi@12480000 { - compatible = "qcom,gsbi-v1.0.0"; - cell-index = <2>; - reg = <0x12480000 0x100>; - clocks = <&gcc GSBI2_H_CLK>; - clock-names = "iface"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - status = "disabled"; - - syscon-tcsr = <&tcsr>; - - gsbi2_serial: serial@12490000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x12490000 0x1000>, - <0x12480000 0x1000>; - interrupts = ; - clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - }; - - i2c@124a0000 { - compatible = "qcom,i2c-qup-v1.1.1"; - reg = <0x124a0000 0x1000>; - interrupts = ; - - clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - - #address-cells = <1>; - #size-cells = <0>; - }; - - }; - - gsbi4: gsbi@16300000 { - compatible = "qcom,gsbi-v1.0.0"; - cell-index = <4>; - reg = <0x16300000 0x100>; - clocks = <&gcc GSBI4_H_CLK>; - clock-names = "iface"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - status = "disabled"; - - syscon-tcsr = <&tcsr>; - - gsbi4_serial: serial@16340000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x16340000 0x1000>, - <0x16300000 0x1000>; - interrupts = ; - clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - }; - - i2c@16380000 { - compatible = "qcom,i2c-qup-v1.1.1"; - reg = <0x16380000 0x1000>; - interrupts = ; - - clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - - #address-cells = <1>; - #size-cells = <0>; - }; - }; - - gsbi5: gsbi@1a200000 { - compatible = "qcom,gsbi-v1.0.0"; - cell-index = <5>; - reg = <0x1a200000 0x100>; - clocks = <&gcc GSBI5_H_CLK>; - clock-names = "iface"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - status = "disabled"; - - syscon-tcsr = <&tcsr>; - - gsbi5_serial: serial@1a240000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x1a240000 0x1000>, - <0x1a200000 0x1000>; - interrupts = ; - clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - }; - - i2c@1a280000 { - compatible = "qcom,i2c-qup-v1.1.1"; - reg = <0x1a280000 0x1000>; - interrupts = ; - - clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - - #address-cells = <1>; - #size-cells = <0>; - }; - - spi@1a280000 { - compatible = "qcom,spi-qup-v1.1.1"; - reg = <0x1a280000 0x1000>; - interrupts = ; - - clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - - #address-cells = <1>; - #size-cells = <0>; - }; - }; - - gsbi7: gsbi@16600000 { - status = "disabled"; - compatible = "qcom,gsbi-v1.0.0"; - cell-index = <7>; - reg = <0x16600000 0x100>; - clocks = <&gcc GSBI7_H_CLK>; - clock-names = "iface"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - syscon-tcsr = <&tcsr>; - - gsbi7_serial: serial@16640000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x16640000 0x1000>, - <0x16600000 0x1000>; - interrupts = ; - clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>; - clock-names = "core", "iface"; - status = "disabled"; - }; - }; - - sata_phy: sata-phy@1b400000 { - compatible = "qcom,ipq806x-sata-phy"; - reg = <0x1b400000 0x200>; - - clocks = <&gcc SATA_PHY_CFG_CLK>; - clock-names = "cfg"; - - #phy-cells = <0>; - status = "disabled"; - }; - - sata: sata@29000000 { - compatible = "qcom,ipq806x-ahci", "generic-ahci"; - reg = <0x29000000 0x180>; - - ports-implemented = <0x1>; - - interrupts = ; - - clocks = <&gcc SFAB_SATA_S_H_CLK>, - <&gcc SATA_H_CLK>, - <&gcc SATA_A_CLK>, - <&gcc SATA_RXOOB_CLK>, - <&gcc SATA_PMALIVE_CLK>; - clock-names = "slave_face", "iface", "core", - "rxoob", "pmalive"; - - assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>; - assigned-clock-rates = <100000000>, <100000000>; - - phys = <&sata_phy>; - phy-names = "sata-phy"; - status = "disabled"; - }; - - qcom,ssbi@500000 { - compatible = "qcom,ssbi"; - reg = <0x00500000 0x1000>; - qcom,controller-type = "pmic-arbiter"; - }; - - gcc: clock-controller@900000 { - compatible = "qcom,gcc-ipq8064"; - reg = <0x00900000 0x4000>; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; - }; - - tsens: thermal-sensor@900000 { - compatible = "qcom,ipq8064-tsens"; - reg = <0x900000 0x3680>; - nvmem-cells = <&tsens_calib>, <&tsens_backup>; - nvmem-cell-names = "calib", "calib_backup"; - interrupts = ; - #thermal-sensor-cells = <1>; - }; - - tcsr: syscon@1a400000 { - compatible = "qcom,tcsr-ipq8064", "syscon"; - reg = <0x1a400000 0x100>; - }; - - lcc: clock-controller@28000000 { - compatible = "qcom,lcc-ipq8064"; - reg = <0x28000000 0x1000>; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - sfpb_mutex_block: syscon@1200600 { - compatible = "syscon"; - reg = <0x01200600 0x100>; - }; - - hs_phy_0: hs_phy_0 { - compatible = "qcom,dwc3-hs-usb-phy"; - regmap = <&usb3_0>; - clocks = <&gcc USB30_0_UTMI_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - }; - - ss_phy_0: ss_phy_0 { - compatible = "qcom,dwc3-ss-usb-phy"; - regmap = <&usb3_0>; - clocks = <&gcc USB30_0_MASTER_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - }; - - usb3_0: usb3@110f8800 { - compatible = "qcom,dwc3", "syscon"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x110f8800 0x8000>; - clocks = <&gcc USB30_0_MASTER_CLK>; - clock-names = "core"; - - ranges; - - resets = <&gcc USB30_0_MASTER_RESET>; - reset-names = "master"; - - status = "disabled"; - - dwc3_0: dwc3@11000000 { - compatible = "snps,dwc3"; - reg = <0x11000000 0xcd00>; - interrupts = ; - phys = <&hs_phy_0>, <&ss_phy_0>; - phy-names = "usb2-phy", "usb3-phy"; - dr_mode = "host"; - snps,dis_u3_susphy_quirk; - }; - }; - - hs_phy_1: hs_phy_1 { - compatible = "qcom,dwc3-hs-usb-phy"; - regmap = <&usb3_1>; - clocks = <&gcc USB30_1_UTMI_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - }; - - ss_phy_1: ss_phy_1 { - compatible = "qcom,dwc3-ss-usb-phy"; - regmap = <&usb3_1>; - clocks = <&gcc USB30_1_MASTER_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - }; - - usb3_1: usb3@100f8800 { - compatible = "qcom,dwc3", "syscon"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x100f8800 0x8000>; - clocks = <&gcc USB30_1_MASTER_CLK>; - clock-names = "core"; - - ranges; - - resets = <&gcc USB30_1_MASTER_RESET>; - reset-names = "master"; - - status = "disabled"; - - dwc3_1: dwc3@10000000 { - compatible = "snps,dwc3"; - reg = <0x10000000 0xcd00>; - interrupts = ; - phys = <&hs_phy_1>, <&ss_phy_1>; - phy-names = "usb2-phy", "usb3-phy"; - dr_mode = "host"; - snps,dis_u3_susphy_quirk; - }; - }; - - pcie0: pci@1b500000 { - compatible = "qcom,pcie-ipq8064"; - reg = <0x1b500000 0x1000 - 0x1b502000 0x80 - 0x1b600000 0x100 - 0x0ff00000 0x100000>; - reg-names = "dbi", "elbi", "parf", "config"; - device_type = "pci"; - linux,pci-domain = <0>; - bus-range = <0x00 0xff>; - num-lanes = <1>; - #address-cells = <3>; - #size-cells = <2>; - - ranges = <0x81000000 0 0x0fe00000 0x0fe00000 0 0x00100000 /* downstream I/O */ - 0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */ - - interrupts = ; - interrupt-names = "msi"; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ - - clocks = <&gcc PCIE_A_CLK>, - <&gcc PCIE_H_CLK>, - <&gcc PCIE_PHY_CLK>, - <&gcc PCIE_AUX_CLK>, - <&gcc PCIE_ALT_REF_CLK>; - clock-names = "core", "iface", "phy", "aux", "ref"; - - assigned-clocks = <&gcc PCIE_ALT_REF_CLK>; - assigned-clock-rates = <100000000>; - - resets = <&gcc PCIE_ACLK_RESET>, - <&gcc PCIE_HCLK_RESET>, - <&gcc PCIE_POR_RESET>, - <&gcc PCIE_PCI_RESET>, - <&gcc PCIE_PHY_RESET>, - <&gcc PCIE_EXT_RESET>; - reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; - - pinctrl-0 = <&pcie0_pins>; - pinctrl-names = "default"; - - perst-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; - - status = "disabled"; - }; - - pcie1: pci@1b700000 { - compatible = "qcom,pcie-ipq8064"; - reg = <0x1b700000 0x1000 - 0x1b702000 0x80 - 0x1b800000 0x100 - 0x31f00000 0x100000>; - reg-names = "dbi", "elbi", "parf", "config"; - device_type = "pci"; - linux,pci-domain = <1>; - bus-range = <0x00 0xff>; - num-lanes = <1>; - #address-cells = <3>; - #size-cells = <2>; - - ranges = <0x81000000 0 0x31e00000 0x31e00000 0 0x00100000 /* downstream I/O */ - 0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */ - - interrupts = ; - interrupt-names = "msi"; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ - - clocks = <&gcc PCIE_1_A_CLK>, - <&gcc PCIE_1_H_CLK>, - <&gcc PCIE_1_PHY_CLK>, - <&gcc PCIE_1_AUX_CLK>, - <&gcc PCIE_1_ALT_REF_CLK>; - clock-names = "core", "iface", "phy", "aux", "ref"; - - assigned-clocks = <&gcc PCIE_1_ALT_REF_CLK>; - assigned-clock-rates = <100000000>; - - resets = <&gcc PCIE_1_ACLK_RESET>, - <&gcc PCIE_1_HCLK_RESET>, - <&gcc PCIE_1_POR_RESET>, - <&gcc PCIE_1_PCI_RESET>, - <&gcc PCIE_1_PHY_RESET>, - <&gcc PCIE_1_EXT_RESET>; - reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; - - pinctrl-0 = <&pcie1_pins>; - pinctrl-names = "default"; - - perst-gpios = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; - - status = "disabled"; - }; - - pcie2: pci@1b900000 { - compatible = "qcom,pcie-ipq8064"; - reg = <0x1b900000 0x1000 - 0x1b902000 0x80 - 0x1ba00000 0x100 - 0x35f00000 0x100000>; - reg-names = "dbi", "elbi", "parf", "config"; - device_type = "pci"; - linux,pci-domain = <2>; - bus-range = <0x00 0xff>; - num-lanes = <1>; - #address-cells = <3>; - #size-cells = <2>; - - ranges = <0x81000000 0 0x35e00000 0x35e00000 0 0x00100000 /* downstream I/O */ - 0x82000000 0 0x32000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */ - - interrupts = ; - interrupt-names = "msi"; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ - - clocks = <&gcc PCIE_2_A_CLK>, - <&gcc PCIE_2_H_CLK>, - <&gcc PCIE_2_PHY_CLK>, - <&gcc PCIE_2_AUX_CLK>, - <&gcc PCIE_2_ALT_REF_CLK>; - clock-names = "core", "iface", "phy", "aux", "ref"; - - assigned-clocks = <&gcc PCIE_2_ALT_REF_CLK>; - assigned-clock-rates = <100000000>; - - resets = <&gcc PCIE_2_ACLK_RESET>, - <&gcc PCIE_2_HCLK_RESET>, - <&gcc PCIE_2_POR_RESET>, - <&gcc PCIE_2_PCI_RESET>, - <&gcc PCIE_2_PHY_RESET>, - <&gcc PCIE_2_EXT_RESET>; - reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; - - pinctrl-0 = <&pcie2_pins>; - pinctrl-names = "default"; - - perst-gpios = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>; - - status = "disabled"; - }; - - adm_dma: dma@18300000 { - compatible = "qcom,adm"; - reg = <0x18300000 0x100000>; - interrupts = ; - #dma-cells = <1>; - - clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>; - clock-names = "core", "iface"; - - resets = <&gcc ADM0_RESET>, - <&gcc ADM0_PBUS_RESET>, - <&gcc ADM0_C0_RESET>, - <&gcc ADM0_C1_RESET>, - <&gcc ADM0_C2_RESET>; - reset-names = "clk", "pbus", "c0", "c1", "c2"; - qcom,ee = <0>; - - status = "disabled"; - }; - - nand_controller: nand-controller@1ac00000 { - compatible = "qcom,ipq806x-nand"; - reg = <0x1ac00000 0x800>; - - clocks = <&gcc EBI2_CLK>, - <&gcc EBI2_AON_CLK>; - clock-names = "core", "aon"; - - dmas = <&adm_dma 3>; - dma-names = "rxtx"; - qcom,cmd-crci = <15>; - qcom,data-crci = <3>; - - status = "disabled"; - - #address-cells = <1>; - #size-cells = <0>; - }; - - nss_common: syscon@03000000 { - compatible = "syscon"; - reg = <0x03000000 0x0000FFFF>; - }; - - qsgmii_csr: syscon@1bb00000 { - compatible = "syscon"; - reg = <0x1bb00000 0x000001FF>; - }; - - stmmac_axi_setup: stmmac-axi-config { - snps,wr_osr_lmt = <7>; - snps,rd_osr_lmt = <7>; - snps,blen = <16 0 0 0 0 0 0>; - }; - - mdio0: mdio@37000000 { - #address-cells = <1>; - #size-cells = <0>; - - compatible = "qcom,ipq8064-mdio", "syscon"; - reg = <0x37000000 0x200000>; - resets = <&gcc GMAC_CORE1_RESET>; - reset-names = "stmmaceth"; - clocks = <&gcc GMAC_CORE1_CLK>; - clock-names = "stmmaceth"; - - status = "disabled"; - }; - - gmac0: ethernet@37000000 { - device_type = "network"; - compatible = "qcom,ipq806x-gmac"; - reg = <0x37000000 0x200000>; - interrupts = ; - interrupt-names = "macirq"; - - snps,axi-config = <&stmmac_axi_setup>; - snps,pbl = <32>; - snps,aal = <1>; - - qcom,nss-common = <&nss_common>; - qcom,qsgmii-csr = <&qsgmii_csr>; - - clocks = <&gcc GMAC_CORE1_CLK>; - clock-names = "stmmaceth"; - - resets = <&gcc GMAC_CORE1_RESET>; - reset-names = "stmmaceth"; - - status = "disabled"; - }; - - gmac1: ethernet@37200000 { - device_type = "network"; - compatible = "qcom,ipq806x-gmac"; - reg = <0x37200000 0x200000>; - interrupts = ; - interrupt-names = "macirq"; - - snps,axi-config = <&stmmac_axi_setup>; - snps,pbl = <32>; - snps,aal = <1>; - - qcom,nss-common = <&nss_common>; - qcom,qsgmii-csr = <&qsgmii_csr>; - - clocks = <&gcc GMAC_CORE2_CLK>; - clock-names = "stmmaceth"; - - resets = <&gcc GMAC_CORE2_RESET>; - reset-names = "stmmaceth"; - - status = "disabled"; - }; - - gmac2: ethernet@37400000 { - device_type = "network"; - compatible = "qcom,ipq806x-gmac", "snps,dwmac"; - reg = <0x37400000 0x200000>; - interrupts = ; - interrupt-names = "macirq"; - - snps,axi-config = <&stmmac_axi_setup>; - snps,pbl = <32>; - snps,aal = <1>; - - qcom,nss-common = <&nss_common>; - qcom,qsgmii-csr = <&qsgmii_csr>; - - clocks = <&gcc GMAC_CORE3_CLK>; - clock-names = "stmmaceth"; - - resets = <&gcc GMAC_CORE3_RESET>; - reset-names = "stmmaceth"; - - status = "disabled"; - }; - - gmac3: ethernet@37600000 { - device_type = "network"; - compatible = "qcom,ipq806x-gmac", "snps,dwmac"; - reg = <0x37600000 0x200000>; - interrupts = ; - interrupt-names = "macirq"; - - snps,axi-config = <&stmmac_axi_setup>; - snps,pbl = <32>; - snps,aal = <1>; - - qcom,nss-common = <&nss_common>; - qcom,qsgmii-csr = <&qsgmii_csr>; - - clocks = <&gcc GMAC_CORE4_CLK>; - clock-names = "stmmaceth"; - - resets = <&gcc GMAC_CORE4_RESET>; - reset-names = "stmmaceth"; - - status = "disabled"; - }; - - /* Temporary fixed regulator */ - vsdcc_fixed: vsdcc-regulator { - compatible = "regulator-fixed"; - regulator-name = "SDCC Power"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - sdcc1bam: dma@12402000 { - compatible = "qcom,bam-v1.3.0"; - reg = <0x12402000 0x8000>; - interrupts = ; - clocks = <&gcc SDC1_H_CLK>; - clock-names = "bam_clk"; - #dma-cells = <1>; - qcom,ee = <0>; - }; - - sdcc3bam: dma@12182000 { - compatible = "qcom,bam-v1.3.0"; - reg = <0x12182000 0x8000>; - interrupts = ; - clocks = <&gcc SDC3_H_CLK>; - clock-names = "bam_clk"; - #dma-cells = <1>; - qcom,ee = <0>; - }; - - amba: amba { - compatible = "arm,amba-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - sdcc1: sdcc@12400000 { - status = "disabled"; - compatible = "arm,pl18x", "arm,primecell"; - arm,primecell-periphid = <0x00051180>; - reg = <0x12400000 0x2000>; - interrupts = ; - interrupt-names = "cmd_irq"; - clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>; - clock-names = "mclk", "apb_pclk"; - bus-width = <8>; - max-frequency = <96000000>; - non-removable; - cap-sd-highspeed; - cap-mmc-highspeed; - vmmc-supply = <&vsdcc_fixed>; - dmas = <&sdcc1bam 2>, <&sdcc1bam 1>; - dma-names = "tx", "rx"; - }; - - sdcc3: sdcc@12180000 { - compatible = "arm,pl18x", "arm,primecell"; - arm,primecell-periphid = <0x00051180>; - status = "disabled"; - reg = <0x12180000 0x2000>; - interrupts = ; - interrupt-names = "cmd_irq"; - clocks = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>; - clock-names = "mclk", "apb_pclk"; - bus-width = <8>; - cap-sd-highspeed; - cap-mmc-highspeed; - max-frequency = <192000000>; - #mmc-ddr-1_8v; - sd-uhs-sdr104; - sd-uhs-ddr50; - vqmmc-supply = <&vsdcc_fixed>; - dmas = <&sdcc3bam 2>, <&sdcc3bam 1>; - dma-names = "tx", "rx"; - }; - }; - }; - - sfpb_mutex: sfpb-mutex { - compatible = "qcom,sfpb-mutex"; - syscon = <&sfpb_mutex_block 4 4>; - - #hwlock-cells = <1>; - }; - - smem { - compatible = "qcom,smem"; - memory-region = <&smem>; - hwlocks = <&sfpb_mutex 3>; - }; -}; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi index a478c3c764..fad39cf008 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -31,6 +31,10 @@ phy-tx0-term-offset = <0>; }; +&sata { + ports-implemented = <0x1>; +}; + &smb208_s2a { regulator-min-microvolt = <775000>; regulator-max-microvolt = <1275000>; diff --git a/target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch similarity index 99% rename from target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch rename to target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch index 1e572a91a5..0dc9debbfd 100644 --- a/target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch +++ b/target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch @@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl. --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -671,6 +671,7 @@ +@@ -119,6 +119,7 @@ reg = <0x800000 0x4000>; gpio-controller; diff --git a/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch b/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch new file mode 100644 index 0000000000..f5483ac734 --- /dev/null +++ b/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch @@ -0,0 +1,29 @@ +From 51befb888f62b1a62434fb4b82328d698a30f9de Mon Sep 17 00:00:00 2001 +From: Ansuel Smith +Date: Thu, 19 Mar 2020 23:44:24 +0100 +Subject: ARM: dts: qcom: add scm definition to ipq806x + +Add missing scm definition for ipq806x soc + +Signed-off-by: Ansuel Smith +Link: https://lore.kernel.org/r/20200319224424.18473-1-ansuelsmth@gmail.com +Signed-off-by: Bjorn Andersson +--- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +@@ -93,6 +93,12 @@ + }; + }; + ++ firmware { ++ scm { ++ compatible = "qcom,scm-ipq806x", "qcom,scm"; ++ }; ++ }; ++ + soc: soc { + #address-cells = <1>; + #size-cells = <1>; diff --git a/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch b/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch new file mode 100644 index 0000000000..568ca5bb88 --- /dev/null +++ b/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch @@ -0,0 +1,130 @@ +--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +@@ -20,7 +20,7 @@ + #address-cells = <1>; + #size-cells = <0>; + +- cpu@0 { ++ cpu0: cpu@0 { + compatible = "qcom,krait"; + enable-method = "qcom,kpss-acc-v1"; + device_type = "cpu"; +@@ -30,7 +30,7 @@ + qcom,saw = <&saw0>; + }; + +- cpu@1 { ++ cpu1: cpu@1 { + compatible = "qcom,krait"; + enable-method = "qcom,kpss-acc-v1"; + device_type = "cpu"; +@@ -67,7 +67,7 @@ + no-map; + }; + +- smem@41000000 { ++ smem: smem@41000000 { + reg = <0x41000000 0x200000>; + no-map; + }; +@@ -155,6 +155,7 @@ + function = "pcie3_rst"; + drive-strength = <12>; + bias-disable; ++ output-low; + }; + }; + +@@ -219,21 +220,23 @@ + acc0: clock-controller@2088000 { + compatible = "qcom,kpss-acc-v1"; + reg = <0x02088000 0x1000>, <0x02008000 0x1000>; ++ clock-output-names = "acpu0_aux"; + }; + + acc1: clock-controller@2098000 { + compatible = "qcom,kpss-acc-v1"; + reg = <0x02098000 0x1000>, <0x02008000 0x1000>; ++ clock-output-names = "acpu1_aux"; + }; + + saw0: regulator@2089000 { +- compatible = "qcom,saw2"; ++ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; + reg = <0x02089000 0x1000>, <0x02009000 0x1000>; + regulator; + }; + + saw1: regulator@2099000 { +- compatible = "qcom,saw2"; ++ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; + reg = <0x02099000 0x1000>, <0x02009000 0x1000>; + regulator; + }; +@@ -251,7 +254,7 @@ + + syscon-tcsr = <&tcsr>; + +- serial@12490000 { ++ gsbi2_serial: serial@12490000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x12490000 0x1000>, + <0x12480000 0x1000>; +@@ -326,7 +329,7 @@ + + syscon-tcsr = <&tcsr>; + +- serial@1a240000 { ++ gsbi5_serial: serial@1a240000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x1a240000 0x1000>, + <0x1a200000 0x1000>; +@@ -397,7 +400,7 @@ + status = "disabled"; + }; + +- sata@29000000 { ++ sata: sata@29000000 { + compatible = "qcom,ipq806x-ahci", "generic-ahci"; + reg = <0x29000000 0x180>; + +@@ -430,6 +433,7 @@ + reg = <0x00900000 0x4000>; + #clock-cells = <1>; + #reset-cells = <1>; ++ #power-domain-cells = <1>; + }; + + tcsr: syscon@1a400000 { +@@ -625,13 +629,13 @@ + qcom,ee = <0>; + }; + +- amba { +- compatible = "simple-bus"; ++ amba: amba { ++ compatible = "arm,amba-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + +- sdcc@12400000 { ++ sdcc1: sdcc@12400000 { + status = "disabled"; + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; +@@ -645,13 +649,12 @@ + non-removable; + cap-sd-highspeed; + cap-mmc-highspeed; +- mmc-ddr-1_8v; + vmmc-supply = <&vsdcc_fixed>; + dmas = <&sdcc1bam 2>, <&sdcc1bam 1>; + dma-names = "tx", "rx"; + }; + +- sdcc@12180000 { ++ sdcc3: sdcc@12180000 { + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; + status = "disabled"; diff --git a/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch b/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch new file mode 100644 index 0000000000..bd3c972f5c --- /dev/null +++ b/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch @@ -0,0 +1,992 @@ +--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include ++#include + + / { + #address-cells = <1>; +@@ -28,6 +30,16 @@ + next-level-cache = <&L2>; + qcom,acc = <&acc0>; + qcom,saw = <&saw0>; ++ clocks = <&kraitcc 0>, <&kraitcc 4>; ++ clock-names = "cpu", "l2"; ++ clock-latency = <100000>; ++ cpu-supply = <&smb208_s2a>; ++ operating-points-v2 = <&opp_table0>; ++ voltage-tolerance = <5>; ++ cooling-min-state = <0>; ++ cooling-max-state = <10>; ++ #cooling-cells = <2>; ++ cpu-idle-states = <&CPU_SPC>; + }; + + cpu1: cpu@1 { +@@ -38,11 +50,458 @@ + next-level-cache = <&L2>; + qcom,acc = <&acc1>; + qcom,saw = <&saw1>; ++ clocks = <&kraitcc 1>, <&kraitcc 4>; ++ clock-names = "cpu", "l2"; ++ clock-latency = <100000>; ++ cpu-supply = <&smb208_s2b>; ++ operating-points-v2 = <&opp_table0>; ++ voltage-tolerance = <5>; ++ cooling-min-state = <0>; ++ cooling-max-state = <10>; ++ #cooling-cells = <2>; ++ cpu-idle-states = <&CPU_SPC>; + }; + + L2: l2-cache { + compatible = "cache"; + cache-level = <2>; ++ qcom,saw = <&saw_l2>; ++ }; ++ ++ qcom,l2 { ++ qcom,l2-rates = <384000000 1000000000 1200000000>; ++ qcom,l2-cpufreq = <384000000 600000000 1200000000>; ++ qcom,l2-volt = <1100000 1100000 1150000>; ++ qcom,l2-supply = <&smb208_s1a>; ++ }; ++ ++ idle-states { ++ CPU_SPC: spc { ++ compatible = "qcom,idle-state-spc", "arm,idle-state"; ++ status = "disabled"; ++ entry-latency-us = <400>; ++ exit-latency-us = <900>; ++ min-residency-us = <3000>; ++ }; ++ }; ++ }; ++ ++ opp_table0: opp_table0 { ++ compatible = "operating-points-v2-qcom-cpu"; ++ nvmem-cells = <&speedbin_efuse>; ++ ++ opp-384000000 { ++ opp-hz = /bits/ 64 <384000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1000000>; ++ opp-microvolt-speed0-pvs1-v0 = <925000>; ++ opp-microvolt-speed0-pvs2-v0 = <875000>; ++ opp-microvolt-speed0-pvs3-v0 = <800000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ ++ opp-600000000 { ++ opp-hz = /bits/ 64 <600000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1050000>; ++ opp-microvolt-speed0-pvs1-v0 = <975000>; ++ opp-microvolt-speed0-pvs2-v0 = <925000>; ++ opp-microvolt-speed0-pvs3-v0 = <850000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ ++ opp-800000000 { ++ opp-hz = /bits/ 64 <800000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1100000>; ++ opp-microvolt-speed0-pvs1-v0 = <1025000>; ++ opp-microvolt-speed0-pvs2-v0 = <995000>; ++ opp-microvolt-speed0-pvs3-v0 = <900000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ ++ opp-1000000000 { ++ opp-hz = /bits/ 64 <1000000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1150000>; ++ opp-microvolt-speed0-pvs1-v0 = <1075000>; ++ opp-microvolt-speed0-pvs2-v0 = <1025000>; ++ opp-microvolt-speed0-pvs3-v0 = <950000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ ++ opp-1200000000 { ++ opp-hz = /bits/ 64 <1200000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1200000>; ++ opp-microvolt-speed0-pvs1-v0 = <1125000>; ++ opp-microvolt-speed0-pvs2-v0 = <1075000>; ++ opp-microvolt-speed0-pvs3-v0 = <1000000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ ++ opp-1400000000 { ++ opp-hz = /bits/ 64 <1400000000>; ++ opp-microvolt-speed0-pvs0-v0 = <1250000>; ++ opp-microvolt-speed0-pvs1-v0 = <1175000>; ++ opp-microvolt-speed0-pvs2-v0 = <1125000>; ++ opp-microvolt-speed0-pvs3-v0 = <1050000>; ++ opp-supported-hw = <0x1>; ++ clock-latency-ns = <100000>; ++ }; ++ }; ++ ++ thermal-zones { ++ tsens_tz_sensor0 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 0>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor1 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 1>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor2 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 2>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor3 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 3>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor4 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 4>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor5 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 5>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor6 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 6>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor7 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 7>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor8 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 8>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor9 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 9>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; ++ }; ++ ++ tsens_tz_sensor10 { ++ polling-delay-passive = <0>; ++ polling-delay = <0>; ++ thermal-sensors = <&tsens 10>; ++ ++ trips { ++ cpu-critical-hi { ++ temperature = <125000>; ++ hysteresis = <2000>; ++ type = "critical_high"; ++ }; ++ ++ cpu-config-hi { ++ temperature = <105000>; ++ hysteresis = <2000>; ++ type = "configurable_hi"; ++ }; ++ ++ cpu-config-lo { ++ temperature = <95000>; ++ hysteresis = <2000>; ++ type = "configurable_lo"; ++ }; ++ ++ cpu-critical-low { ++ temperature = <0>; ++ hysteresis = <2000>; ++ type = "critical_low"; ++ }; ++ }; + }; + }; + +@@ -93,6 +552,15 @@ + }; + }; + ++ fab-scaling { ++ compatible = "qcom,fab-scaling"; ++ clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>; ++ clock-names = "apps-fab-clk", "ddr-fab-clk"; ++ fab_freq_high = <533000000>; ++ fab_freq_nominal = <400000000>; ++ cpu_freq_threshold = <1000000000>; ++ }; ++ + firmware { + scm { + compatible = "qcom,scm-ipq806x", "qcom,scm"; +@@ -120,6 +588,84 @@ + reg-names = "lpass-lpaif"; + }; + ++ qfprom: qfprom@700000 { ++ compatible = "qcom,qfprom", "syscon"; ++ reg = <0x700000 0x1000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ status = "okay"; ++ tsens_calib: calib@400 { ++ reg = <0x400 0xb>; ++ }; ++ tsens_backup: backup@410 { ++ reg = <0x410 0xb>; ++ }; ++ speedbin_efuse: speedbin@0c0 { ++ reg = <0x0c0 0x4>; ++ }; ++ }; ++ ++ rpm: rpm@108000 { ++ compatible = "qcom,rpm-ipq8064"; ++ reg = <0x108000 0x1000>; ++ qcom,ipc = <&l2cc 0x8 2>; ++ ++ interrupts = , ++ , ++ ; ++ interrupt-names = "ack", "err", "wakeup"; ++ ++ clocks = <&gcc RPM_MSG_RAM_H_CLK>; ++ clock-names = "ram"; ++ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ rpmcc: clock-controller { ++ compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc"; ++ #clock-cells = <1>; ++ }; ++ ++ regulators { ++ compatible = "qcom,rpm-smb208-regulators"; ++ ++ smb208_s1a: s1a { ++ regulator-min-microvolt = <1050000>; ++ regulator-max-microvolt = <1150000>; ++ ++ qcom,switch-mode-frequency = <1200000>; ++ }; ++ ++ smb208_s1b: s1b { ++ regulator-min-microvolt = <1050000>; ++ regulator-max-microvolt = <1150000>; ++ ++ qcom,switch-mode-frequency = <1200000>; ++ }; ++ ++ smb208_s2a: s2a { ++ regulator-min-microvolt = < 800000>; ++ regulator-max-microvolt = <1250000>; ++ ++ qcom,switch-mode-frequency = <1200000>; ++ }; ++ ++ smb208_s2b: s2b { ++ regulator-min-microvolt = < 800000>; ++ regulator-max-microvolt = <1250000>; ++ ++ qcom,switch-mode-frequency = <1200000>; ++ }; ++ }; ++ }; ++ ++ rng@1a500000 { ++ compatible = "qcom,prng"; ++ reg = <0x1a500000 0x200>; ++ clocks = <&gcc PRNG_CLK>; ++ clock-names = "core"; ++ }; ++ + qcom_pinmux: pinmux@800000 { + compatible = "qcom,ipq8064-pinctrl"; + reg = <0x800000 0x4000>; +@@ -159,6 +705,15 @@ + }; + }; + ++ i2c4_pins: i2c4_pinmux { ++ mux { ++ pins = "gpio12", "gpio13"; ++ function = "gsbi4"; ++ drive-strength = <12>; ++ bias-disable; ++ }; ++ }; ++ + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; +@@ -168,6 +723,53 @@ + }; + }; + ++ nand_pins: nand_pins { ++ disable { ++ pins = "gpio34", "gpio35", "gpio36", ++ "gpio37", "gpio38"; ++ function = "nand"; ++ drive-strength = <10>; ++ bias-disable; ++ }; ++ ++ pullups { ++ pins = "gpio39"; ++ function = "nand"; ++ drive-strength = <10>; ++ bias-pull-up; ++ }; ++ ++ hold { ++ pins = "gpio40", "gpio41", "gpio42", ++ "gpio43", "gpio44", "gpio45", ++ "gpio46", "gpio47"; ++ function = "nand"; ++ drive-strength = <10>; ++ bias-bus-hold; ++ }; ++ }; ++ ++ mdio0_pins: mdio0_pins { ++ mux { ++ pins = "gpio0", "gpio1"; ++ function = "mdio"; ++ drive-strength = <8>; ++ bias-disable; ++ }; ++ }; ++ ++ rgmii2_pins: rgmii2_pins { ++ mux { ++ pins = "gpio27", "gpio28", "gpio29", ++ "gpio30", "gpio31", "gpio32", ++ "gpio51", "gpio52", "gpio59", ++ "gpio60", "gpio61", "gpio62"; ++ function = "rgmii2"; ++ drive-strength = <8>; ++ bias-disable; ++ }; ++ }; ++ + leds_pins: leds_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", +@@ -229,6 +831,17 @@ + clock-output-names = "acpu1_aux"; + }; + ++ l2cc: clock-controller@2011000 { ++ compatible = "qcom,kpss-gcc", "syscon"; ++ reg = <0x2011000 0x1000>; ++ clock-output-names = "acpu_l2_aux"; ++ }; ++ ++ kraitcc: clock-controller { ++ compatible = "qcom,krait-cc-v1"; ++ #clock-cells = <1>; ++ }; ++ + saw0: regulator@2089000 { + compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; + reg = <0x02089000 0x1000>, <0x02009000 0x1000>; +@@ -241,6 +854,17 @@ + regulator; + }; + ++ saw_l2: regulator@02012000 { ++ compatible = "qcom,saw2", "syscon"; ++ reg = <0x02012000 0x1000>; ++ regulator; ++ }; ++ ++ sic_non_secure: sic-non-secure@12100000 { ++ compatible = "syscon"; ++ reg = <0x12100000 0x10000>; ++ }; ++ + gsbi2: gsbi@12480000 { + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <2>; +@@ -436,6 +1060,15 @@ + #power-domain-cells = <1>; + }; + ++ tsens: thermal-sensor@900000 { ++ compatible = "qcom,ipq8064-tsens"; ++ reg = <0x900000 0x3680>; ++ nvmem-cells = <&tsens_calib>, <&tsens_backup>; ++ nvmem-cell-names = "calib", "calib_backup"; ++ interrupts = ; ++ #thermal-sensor-cells = <1>; ++ }; ++ + tcsr: syscon@1a400000 { + compatible = "qcom,tcsr-ipq8064", "syscon"; + reg = <0x1a400000 0x100>; +@@ -448,6 +1081,95 @@ + #reset-cells = <1>; + }; + ++ sfpb_mutex_block: syscon@1200600 { ++ compatible = "syscon"; ++ reg = <0x01200600 0x100>; ++ }; ++ ++ hs_phy_0: hs_phy_0 { ++ compatible = "qcom,dwc3-hs-usb-phy"; ++ regmap = <&usb3_0>; ++ clocks = <&gcc USB30_0_UTMI_CLK>; ++ clock-names = "ref"; ++ #phy-cells = <0>; ++ }; ++ ++ ss_phy_0: ss_phy_0 { ++ compatible = "qcom,dwc3-ss-usb-phy"; ++ regmap = <&usb3_0>; ++ clocks = <&gcc USB30_0_MASTER_CLK>; ++ clock-names = "ref"; ++ #phy-cells = <0>; ++ }; ++ ++ usb3_0: usb3@110f8800 { ++ compatible = "qcom,dwc3", "syscon"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ reg = <0x110f8800 0x8000>; ++ clocks = <&gcc USB30_0_MASTER_CLK>; ++ clock-names = "core"; ++ ++ ranges; ++ ++ resets = <&gcc USB30_0_MASTER_RESET>; ++ reset-names = "master"; ++ ++ status = "disabled"; ++ ++ dwc3_0: dwc3@11000000 { ++ compatible = "snps,dwc3"; ++ reg = <0x11000000 0xcd00>; ++ interrupts = ; ++ phys = <&hs_phy_0>, <&ss_phy_0>; ++ phy-names = "usb2-phy", "usb3-phy"; ++ dr_mode = "host"; ++ snps,dis_u3_susphy_quirk; ++ }; ++ }; ++ ++ hs_phy_1: hs_phy_1 { ++ compatible = "qcom,dwc3-hs-usb-phy"; ++ regmap = <&usb3_1>; ++ clocks = <&gcc USB30_1_UTMI_CLK>; ++ clock-names = "ref"; ++ #phy-cells = <0>; ++ }; ++ ++ ss_phy_1: ss_phy_1 { ++ compatible = "qcom,dwc3-ss-usb-phy"; ++ regmap = <&usb3_1>; ++ clocks = <&gcc USB30_1_MASTER_CLK>; ++ clock-names = "ref"; ++ #phy-cells = <0>; ++ }; ++ ++ usb3_1: usb3@100f8800 { ++ compatible = "qcom,dwc3", "syscon"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ reg = <0x100f8800 0x8000>; ++ clocks = <&gcc USB30_1_MASTER_CLK>; ++ clock-names = "core"; ++ ++ ranges; ++ ++ resets = <&gcc USB30_1_MASTER_RESET>; ++ reset-names = "master"; ++ ++ status = "disabled"; ++ ++ dwc3_1: dwc3@10000000 { ++ compatible = "snps,dwc3"; ++ reg = <0x10000000 0xcd00>; ++ interrupts = ; ++ phys = <&hs_phy_1>, <&ss_phy_1>; ++ phy-names = "usb2-phy", "usb3-phy"; ++ dr_mode = "host"; ++ snps,dis_u3_susphy_quirk; ++ }; ++ }; ++ + pcie0: pci@1b500000 { + compatible = "qcom,pcie-ipq8064"; + reg = <0x1b500000 0x1000 +@@ -601,6 +1323,167 @@ + perst-gpio = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>; + }; + ++ adm_dma: dma@18300000 { ++ compatible = "qcom,adm"; ++ reg = <0x18300000 0x100000>; ++ interrupts = ; ++ #dma-cells = <1>; ++ ++ clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>; ++ clock-names = "core", "iface"; ++ ++ resets = <&gcc ADM0_RESET>, ++ <&gcc ADM0_PBUS_RESET>, ++ <&gcc ADM0_C0_RESET>, ++ <&gcc ADM0_C1_RESET>, ++ <&gcc ADM0_C2_RESET>; ++ reset-names = "clk", "pbus", "c0", "c1", "c2"; ++ qcom,ee = <0>; ++ ++ status = "disabled"; ++ }; ++ ++ nand_controller: nand-controller@1ac00000 { ++ compatible = "qcom,ipq806x-nand"; ++ reg = <0x1ac00000 0x800>; ++ ++ clocks = <&gcc EBI2_CLK>, ++ <&gcc EBI2_AON_CLK>; ++ clock-names = "core", "aon"; ++ ++ dmas = <&adm_dma 3>; ++ dma-names = "rxtx"; ++ qcom,cmd-crci = <15>; ++ qcom,data-crci = <3>; ++ ++ status = "disabled"; ++ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ }; ++ ++ nss_common: syscon@03000000 { ++ compatible = "syscon"; ++ reg = <0x03000000 0x0000FFFF>; ++ }; ++ ++ qsgmii_csr: syscon@1bb00000 { ++ compatible = "syscon"; ++ reg = <0x1bb00000 0x000001FF>; ++ }; ++ ++ stmmac_axi_setup: stmmac-axi-config { ++ snps,wr_osr_lmt = <7>; ++ snps,rd_osr_lmt = <7>; ++ snps,blen = <16 0 0 0 0 0 0>; ++ }; ++ ++ mdio0: mdio@37000000 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ compatible = "qcom,ipq8064-mdio", "syscon"; ++ reg = <0x37000000 0x200000>; ++ resets = <&gcc GMAC_CORE1_RESET>; ++ reset-names = "stmmaceth"; ++ clocks = <&gcc GMAC_CORE1_CLK>; ++ clock-names = "stmmaceth"; ++ ++ status = "disabled"; ++ }; ++ ++ gmac0: ethernet@37000000 { ++ device_type = "network"; ++ compatible = "qcom,ipq806x-gmac"; ++ reg = <0x37000000 0x200000>; ++ interrupts = ; ++ interrupt-names = "macirq"; ++ ++ snps,axi-config = <&stmmac_axi_setup>; ++ snps,pbl = <32>; ++ snps,aal = <1>; ++ ++ qcom,nss-common = <&nss_common>; ++ qcom,qsgmii-csr = <&qsgmii_csr>; ++ ++ clocks = <&gcc GMAC_CORE1_CLK>; ++ clock-names = "stmmaceth"; ++ ++ resets = <&gcc GMAC_CORE1_RESET>; ++ reset-names = "stmmaceth"; ++ ++ status = "disabled"; ++ }; ++ ++ gmac1: ethernet@37200000 { ++ device_type = "network"; ++ compatible = "qcom,ipq806x-gmac"; ++ reg = <0x37200000 0x200000>; ++ interrupts = ; ++ interrupt-names = "macirq"; ++ ++ snps,axi-config = <&stmmac_axi_setup>; ++ snps,pbl = <32>; ++ snps,aal = <1>; ++ ++ qcom,nss-common = <&nss_common>; ++ qcom,qsgmii-csr = <&qsgmii_csr>; ++ ++ clocks = <&gcc GMAC_CORE2_CLK>; ++ clock-names = "stmmaceth"; ++ ++ resets = <&gcc GMAC_CORE2_RESET>; ++ reset-names = "stmmaceth"; ++ ++ status = "disabled"; ++ }; ++ ++ gmac2: ethernet@37400000 { ++ device_type = "network"; ++ compatible = "qcom,ipq806x-gmac", "snps,dwmac"; ++ reg = <0x37400000 0x200000>; ++ interrupts = ; ++ interrupt-names = "macirq"; ++ ++ snps,axi-config = <&stmmac_axi_setup>; ++ snps,pbl = <32>; ++ snps,aal = <1>; ++ ++ qcom,nss-common = <&nss_common>; ++ qcom,qsgmii-csr = <&qsgmii_csr>; ++ ++ clocks = <&gcc GMAC_CORE3_CLK>; ++ clock-names = "stmmaceth"; ++ ++ resets = <&gcc GMAC_CORE3_RESET>; ++ reset-names = "stmmaceth"; ++ ++ status = "disabled"; ++ }; ++ ++ gmac3: ethernet@37600000 { ++ device_type = "network"; ++ compatible = "qcom,ipq806x-gmac", "snps,dwmac"; ++ reg = <0x37600000 0x200000>; ++ interrupts = ; ++ interrupt-names = "macirq"; ++ ++ snps,axi-config = <&stmmac_axi_setup>; ++ snps,pbl = <32>; ++ snps,aal = <1>; ++ ++ qcom,nss-common = <&nss_common>; ++ qcom,qsgmii-csr = <&qsgmii_csr>; ++ ++ clocks = <&gcc GMAC_CORE4_CLK>; ++ clock-names = "stmmaceth"; ++ ++ resets = <&gcc GMAC_CORE4_RESET>; ++ reset-names = "stmmaceth"; ++ ++ status = "disabled"; ++ }; ++ + vsdcc_fixed: vsdcc-regulator { + compatible = "regulator-fixed"; + regulator-name = "SDCC Power"; +@@ -676,4 +1559,17 @@ + }; + }; + }; ++ ++ sfpb_mutex: sfpb-mutex { ++ compatible = "qcom,sfpb-mutex"; ++ syscon = <&sfpb_mutex_block 4 4>; ++ ++ #hwlock-cells = <1>; ++ }; ++ ++ smem { ++ compatible = "qcom,smem"; ++ memory-region = <&smem>; ++ hwlocks = <&sfpb_mutex 3>; ++ }; + }; From 7c1c0a00fc7948d119a3e3a0dc7a8e89a5c54acc Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 14 Jul 2020 13:14:50 +0200 Subject: [PATCH 03/45] ipq806x: use qcom-ipq8064-v1.0.dtsi from upstream This uses upstream qcom-ipq8064-v1.0.dtsi and modifies it by patches instead of keeping a local version. As a consequence: - we use a part of the shared definitions there and update device DTS files accordingly - we move additional stuff from our local v1.0.dtsi to the patch - we drop partitions, LEDs and keys from the file as we will implement them differently anyway Like with the previous patch, this follows the idea that a diff from upstream might be easier to handle than a big file of our own with different distribution pattern of properties. Signed-off-by: Adrian Schmutzler --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 56 ++---------- .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 57 +++--------- .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 78 ++++++---------- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 31 +++---- .../arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 31 ------- .../arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 34 ++----- .../084-ipq8064-v1.0-dtsi-cleanup.patch | 89 +++++++++++++++++++ .../085-ipq8064-v1.0-dtsi-additions.patch | 26 ++++++ 8 files changed, 183 insertions(+), 219 deletions(-) delete mode 100644 target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi create mode 100644 target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch create mode 100644 target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 6c3410bf35..a23f3da469 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -28,46 +28,16 @@ status = "okay"; }; -&gsbi4 { - qcom,mode = ; - status = "okay"; +/* +* The i2c device on gsbi4 should not be enabled. +* On ipq806x designs gsbi4 i2c is meant for exclusive +* RPM usage. Turning this on in kernel manifests as +* i2c failure for the RPM. +*/ - serial@16340000 { - status = "okay"; - }; - - /* - * The i2c device on gsbi4 should not be enabled. - * On ipq806x designs gsbi4 i2c is meant for exclusive - * RPM usage. Turning this on in kernel manifests as - * i2c failure for the RPM. - */ -}; - -&gsbi5 { - qcom,mode = ; - status = "okay"; - - spi4: spi@1a280000 { - status = "okay"; - spi-max-frequency = <50000000>; - - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; - - cs-gpios = <&qcom_pinmux 20 0>; - - m25p80@0 { - compatible = "s25fl256s1"; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - reg = <0>; - - partitions { - compatible = "qcom,smem"; - }; - }; +&flash { + partitions { + compatible = "qcom,smem"; }; }; @@ -156,11 +126,3 @@ full-duplex; }; }; - -&sata_phy { - status = "okay"; -}; - -&sata { - status = "okay"; -}; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index 41a2bf116e..59c06dbccc 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -36,54 +36,17 @@ }; }; -&gsbi4 { - qcom,mode = ; - status = "okay"; - serial@16340000 { - status = "okay"; +/* +* The i2c device on gsbi4 should not be enabled. +* On ipq806x designs gsbi4 i2c is meant for exclusive +* RPM usage. Turning this on in kernel manifests as +* i2c failure for the RPM. +*/ + +&flash { + partitions { + compatible = "qcom,smem"; }; - - /* - * The i2c device on gsbi4 should not be enabled. - * On ipq806x designs gsbi4 i2c is meant for exclusive - * RPM usage. Turning this on in kernel manifests as - * i2c failure for the RPM. - */ -}; - -&gsbi5 { - qcom,mode = ; - status = "okay"; - - spi4: spi@1a280000 { - status = "okay"; - spi-max-frequency = <50000000>; - - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; - - cs-gpios = <&qcom_pinmux 20 0>; - - m25p80@0 { - compatible = "s25fl256s1"; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - reg = <0>; - - partitions { - compatible = "qcom,smem"; - }; - }; - }; -}; - -&sata_phy { - status = "okay"; -}; - -&sata { - status = "okay"; }; &usb3_0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts index 1f68f826cb..8e8d942fbd 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -38,61 +38,41 @@ }; }; -&gsbi5 { - qcom,mode = ; - status = "okay"; +&gsbi4 { + status = "disabled"; +}; - spi4: spi@1a280000 { - status = "okay"; - spi-max-frequency = <50000000>; +&gsbi4_serial { + status = "disabled"; +}; - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; +&flash { + m25p,fast-read; - cs-gpios = <&qcom_pinmux 20 0>; - - m25p80@0 { - compatible = "s25fl256s1"; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - reg = <0>; - m25p,fast-read; - - partition@0 { - label = "lowlevel_init"; - reg = <0x0 0x1b0000>; - }; - - partition@1 { - label = "u-boot"; - reg = <0x1b0000 0x80000>; - }; - - partition@2 { - label = "u-boot-env"; - reg = <0x230000 0x40000>; - }; - - partition@3 { - label = "caldata"; - reg = <0x270000 0x40000>; - }; - - partition@4 { - label = "firmware"; - reg = <0x2b0000 0x1d50000>; - }; - }; + partition@0 { + label = "lowlevel_init"; + reg = <0x0 0x1b0000>; }; -}; -&sata_phy { - status = "okay"; -}; + partition@1 { + label = "u-boot"; + reg = <0x1b0000 0x80000>; + }; -&sata { - status = "okay"; + partition@2 { + label = "u-boot-env"; + reg = <0x230000 0x40000>; + }; + + partition@3 { + label = "caldata"; + reg = <0x270000 0x40000>; + }; + + partition@4 { + label = "firmware"; + reg = <0x2b0000 0x1d50000>; + }; }; &usb3_0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 49b34a32c6..c1fb3b5534 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -133,26 +133,19 @@ }; }; -&gsbi4 { - qcom,mode = ; - status = "okay"; - serial@16340000 { - status = "okay"; +/* +* The i2c device on gsbi4 should not be enabled. +* On ipq806x designs gsbi4 i2c is meant for exclusive +* RPM usage. Turning this on in kernel manifests as +* i2c failure for the RPM. +*/ + +&gsbi5 { + status = "disabled"; + + spi@1a280000 { + status = "disabled"; }; - /* - * The i2c device on gsbi4 should not be enabled. - * On ipq806x designs gsbi4 i2c is meant for exclusive - * RPM usage. Turning this on in kernel manifests as - * i2c failure for the RPM. - */ -}; - -&sata_phy { - status = "okay"; -}; - -&sata { - status = "okay"; }; &usb3_0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi deleted file mode 100644 index 8d93f5c3ed..0000000000 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi +++ /dev/null @@ -1,31 +0,0 @@ -#include "qcom-ipq8064.dtsi" - -/ { - aliases { - serial0 = &gsbi4_serial; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; -}; - -&CPU_SPC { - status = "okay"; -}; - -&pcie0 { - phy-tx0-term-offset = <7>; -}; - -&pcie1 { - phy-tx0-term-offset = <7>; -}; - -&pcie2 { - phy-tx0-term-offset = <7>; -}; - -&sata { - ports-implemented = <0x1>; -}; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index 6dc1f92751..c4d2187ef6 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -336,39 +336,21 @@ }; }; -&gsbi4 { - status = "okay"; - qcom,mode = ; -}; - &gsbi4_serial { - status = "okay"; - pinctrl-0 = <&uart0_pins>; pinctrl-names = "default"; }; -&gsbi5 { - status = "okay"; +&flash { + compatible = "jedec,spi-nor"; +}; - qcom,mode = ; +&sata_phy { + status = "disabled"; +}; - spi@1a280000 { - status = "okay"; - - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; - - cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; - - s25fl256s1@0 { - compatible = "jedec,spi-nor"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0>; - spi-max-frequency = <50000000>; - }; - }; +&sata { + status = "disabled"; }; &ss_phy_0 { /* USB3 port 0 SS phy */ diff --git a/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch b/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch new file mode 100644 index 0000000000..e5ea8e6393 --- /dev/null +++ b/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch @@ -0,0 +1,89 @@ +This uses upstream qcom-ipq8064-v1.0.dtsi and modifies it by patches +instead of keeping a local version. +We drop partitions, LEDs and keys from the file as we will implement +them differently anyway. + +--- a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi +@@ -42,16 +42,6 @@ + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; +- +- partition@0 { +- label = "rootfs"; +- reg = <0x0 0x1000000>; +- }; +- +- partition@1 { +- label = "scratch"; +- reg = <0x1000000 0x1000000>; +- }; + }; + }; + }; +@@ -64,64 +54,5 @@ + ports-implemented = <0x1>; + status = "ok"; + }; +- +- gpio_keys { +- compatible = "gpio-keys"; +- pinctrl-0 = <&buttons_pins>; +- pinctrl-names = "default"; +- +- button@1 { +- label = "reset"; +- linux,code = ; +- gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; +- linux,input-type = <1>; +- debounce-interval = <60>; +- }; +- button@2 { +- label = "wps"; +- linux,code = ; +- gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; +- linux,input-type = <1>; +- debounce-interval = <60>; +- }; +- }; +- +- leds { +- compatible = "gpio-leds"; +- pinctrl-0 = <&leds_pins>; +- pinctrl-names = "default"; +- +- led@7 { +- label = "led_usb1"; +- gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; +- linux,default-trigger = "usbdev"; +- default-state = "off"; +- }; +- +- led@8 { +- label = "led_usb3"; +- gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; +- linux,default-trigger = "usbdev"; +- default-state = "off"; +- }; +- +- led@9 { +- label = "status_led_fail"; +- gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; +- default-state = "off"; +- }; +- +- led@26 { +- label = "sata_led"; +- gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; +- default-state = "off"; +- }; +- +- led@53 { +- label = "status_led_pass"; +- gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; +- default-state = "off"; +- }; +- }; + }; + }; diff --git a/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch b/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch new file mode 100644 index 0000000000..9837fb156d --- /dev/null +++ b/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch @@ -0,0 +1,26 @@ +This uses upstream qcom-ipq8064-v1.0.dtsi and modifies it by patches +instead of keeping a local version. This patch adds our local adjustments +for the (local) additional contents of qcom-ipq8064.dtsi + +--- a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi +@@ -56,3 +56,19 @@ + }; + }; + }; ++ ++&CPU_SPC { ++ status = "okay"; ++}; ++ ++&pcie0 { ++ phy-tx0-term-offset = <7>; ++}; ++ ++&pcie1 { ++ phy-tx0-term-offset = <7>; ++}; ++ ++&pcie2 { ++ phy-tx0-term-offset = <7>; ++}; From 816973f42aa47d910d3e35c2f8f8eb9d67416396 Mon Sep 17 00:00:00 2001 From: Tobias Welz Date: Mon, 3 Aug 2020 21:28:31 +0200 Subject: [PATCH 04/45] ramips: enable flashing WizFi630S via OEM firmware WIZnet WizFi630s board name is written slightly different it its OEM OpenWrt firmware. This causes an incompatibility warning during flashing with sysupgrade. This patch is adding the vendor board name to the supported devices list to avoid this warning. For initial flashing you can use sysupgrade via command line or luci beside of TFTP. Do not keep the OEM configuration during sysupgrade. Signed-off-by: Tobias Welz --- target/linux/ramips/image/mt76x8.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index d170eaa065..669077c1d3 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -658,6 +658,7 @@ define Device/wiznet_wizfi630s IMAGE_SIZE := 32448k DEVICE_VENDOR := WIZnet DEVICE_MODEL := WizFi630S + SUPPORTED_DEVICES += wizfi630s endef TARGET_DEVICES += wiznet_wizfi630s From 4c73c34ec4215deb690bf03faea2a0fe725476f0 Mon Sep 17 00:00:00 2001 From: Alexey Dobrovolsky Date: Wed, 5 Aug 2020 22:50:53 +0300 Subject: [PATCH 05/45] ramips: switch rt305x subtarget to kernel 5.4 RT3x5x seems to work fine with kernel 5.4. Set the default kernel version to 5.4 to bring this to a broader audience. Since 4 of 6 targets are on kernel 5.4 now, invert the kernel version setup logic in Makefile/target.mk files. Tested on ZyXEL Keenetic. Signed-off-by: Alexey Dobrovolsky [invert version setup logic] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/Makefile | 2 +- target/linux/ramips/mt7620/target.mk | 2 -- target/linux/ramips/mt7621/target.mk | 2 -- target/linux/ramips/mt76x8/target.mk | 1 - target/linux/ramips/rt288x/target.mk | 2 ++ target/linux/ramips/rt3883/target.mk | 2 ++ 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 864cfa543d..c3d118b2ab 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=MediaTek Ralink MIPS SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883 FEATURES:=squashfs gpio -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=5.4 KERNEL_TESTING_PATCHVER:=5.4 define Target/Description diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk index ff890c5540..56ceaee37f 100644 --- a/target/linux/ramips/mt7620/target.mk +++ b/target/linux/ramips/mt7620/target.mk @@ -9,8 +9,6 @@ CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig -KERNEL_PATCHVER:=5.4 - define Target/Description Build firmware images for Ralink MT7620 based boards. endef diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk index 2684ea5b64..c2eba1d0da 100644 --- a/target/linux/ramips/mt7621/target.mk +++ b/target/linux/ramips/mt7621/target.mk @@ -7,8 +7,6 @@ BOARDNAME:=MT7621 based boards FEATURES+=nand ramdisk rtc usb minor CPU_TYPE:=24kc -KERNEL_PATCHVER:=5.4 - define Target/Description Build firmware images for Ralink MT7621 based boards. endef diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk index 4ecc19ff62..e13a12cf58 100644 --- a/target/linux/ramips/mt76x8/target.mk +++ b/target/linux/ramips/mt76x8/target.mk @@ -8,7 +8,6 @@ FEATURES+=usb ramdisk CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-mt7603 wpad-basic swconfig -KERNEL_PATCHVER:=5.4 define Target/Description Build firmware images for Ralink MT76x8 based boards. diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk index 57b0ee2251..917f150f24 100644 --- a/target/linux/ramips/rt288x/target.mk +++ b/target/linux/ramips/rt288x/target.mk @@ -9,6 +9,8 @@ CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig +KERNEL_PATCHVER:=4.14 + define Target/Description Build firmware images for Ralink RT288x based boards. endef diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk index 4a032f5437..9c719f8b76 100644 --- a/target/linux/ramips/rt3883/target.mk +++ b/target/linux/ramips/rt3883/target.mk @@ -9,6 +9,8 @@ CPU_TYPE:=74kc DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini swconfig +KERNEL_PATCHVER:=4.14 + define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards. endef From 96b87196b0788d4cdaa81a49a65d198d9f6c90d2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 7 Jul 2020 15:34:53 +0200 Subject: [PATCH 06/45] dsaconfig: introduce package for UCI configuration of VLAN filter rules This package provides the necessary files to translate `config dsa_vlan` and `config dsa_port` sections of `/etc/config/network` into appropriate bridge vlan filter rules. The approach of the configuration is to bridge all DSA ports into a logical bridge device, called "switch0" by default, and to set VLAN port membership, tagging state and PVID as specified by UCI on each port and on the switch bridge device itself, allowing logical interfaces to reference port VLAN groups by using "switch0.N" as ifname, where N denotes the VLAN ID. Signed-off-by: Jo-Philipp Wich --- package/network/config/dsaconfig/Makefile | 40 +++ .../config/dsaconfig/files/dsaconfig.hotplug | 7 + .../config/dsaconfig/files/dsaconfig.include | 11 + .../config/dsaconfig/files/dsaconfig.sh | 306 ++++++++++++++++++ 4 files changed, 364 insertions(+) create mode 100644 package/network/config/dsaconfig/Makefile create mode 100644 package/network/config/dsaconfig/files/dsaconfig.hotplug create mode 100755 package/network/config/dsaconfig/files/dsaconfig.include create mode 100755 package/network/config/dsaconfig/files/dsaconfig.sh diff --git a/package/network/config/dsaconfig/Makefile b/package/network/config/dsaconfig/Makefile new file mode 100644 index 0000000000..4069022224 --- /dev/null +++ b/package/network/config/dsaconfig/Makefile @@ -0,0 +1,40 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=dsaconfig +PKG_RELEASE:=1 +PKG_LICENSE:=GPL-2.0 + +include $(INCLUDE_DIR)/package.mk + +define Package/dsaconfig + SECTION:=net + CATEGORY:=Network + MAINTAINER:=Jo-Philipp Wich + TITLE:=UCI configuration support for DSA switch VLAN filtering + DEPENDS:= +ip-bridge +ip-full + PKGARCH:=all +endef + +define Package/dsaconfig/description + This package provides UCI configuration abstraction for VLAN filter rules + on top of DSA switches. +endef + +define Build/Compile +endef + +define Build/Configure +endef + +define Package/dsaconfig/install + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/dsaconfig.hotplug $(1)/etc/hotplug.d/iface/01-dsaconfig + + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_DATA) ./files/dsaconfig.include $(1)/lib/network/dsaconfig.sh + + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/dsaconfig.sh $(1)/sbin/dsaconfig +endef + +$(eval $(call BuildPackage,dsaconfig)) diff --git a/package/network/config/dsaconfig/files/dsaconfig.hotplug b/package/network/config/dsaconfig/files/dsaconfig.hotplug new file mode 100644 index 0000000000..fc2a489dea --- /dev/null +++ b/package/network/config/dsaconfig/files/dsaconfig.hotplug @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$ACTION" = ifup ] && [ "$INTERFACE" = loopback ]; then + . /lib/network/dsaconfig.sh + setup_switch +fi + diff --git a/package/network/config/dsaconfig/files/dsaconfig.include b/package/network/config/dsaconfig/files/dsaconfig.include new file mode 100755 index 0000000000..4ac11d8061 --- /dev/null +++ b/package/network/config/dsaconfig/files/dsaconfig.include @@ -0,0 +1,11 @@ +#!/bin/sh + +setup_switch() { + # Skip switch setup on network restart. The netifd process + # will be started afterwards and remove all interfaces again... + if [ "$initscript" = /etc/init.d/network ] && [ "$action" = restart ]; then + return 0 + fi + + /sbin/dsaconfig apply 2>&1 | logger -t dsaconfig +} diff --git a/package/network/config/dsaconfig/files/dsaconfig.sh b/package/network/config/dsaconfig/files/dsaconfig.sh new file mode 100755 index 0000000000..f5769bf495 --- /dev/null +++ b/package/network/config/dsaconfig/files/dsaconfig.sh @@ -0,0 +1,306 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/network.sh + +switch_names="" + +warn() { + echo "$@" >&2 +} + +clear_port_vlans() { + local port=$1 + local self=$2 + local vlans=$(bridge vlan show dev "$port" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') + + local vlan + for vlan in $vlans; do + bridge vlan del vid "$vlan" dev "$port" $self + done +} + +lookup_switch() { + local cfg=$1 + local swname + + config_get swname "$cfg" switch + + # Auto-determine switch if not specified ... + if [ -z "$swname" ]; then + case "$switch_names" in + *\ *) + warn "VLAN section '$cfg' does not specify a switch but multiple switches present, using first one" + swname=${switch_names%% *} + ;; + *) + swname=${switch_names} + ;; + esac + + # ... otherwise check if the referenced switch is declared + else + case " $switch_names " in + *" $swname "*) : ;; + *) + warn "Switch '$swname' specified by VLAN section '$cfg' does not exist" + return 1 + ;; + esac + fi + + export -n "switch=$swname" +} + +validate_vid() { + local vid=$1 + + case "$vid" in + [1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-4][0-9][0-9][0-9]) + if [ $vid -gt 4096 ]; then + return 1 + fi + ;; + *) + return 1 + ;; + esac + + return 0 +} + +setup_switch() { + local cfg=$1 + local cpu + + # Read configured CPU port from uci ... + config_get cpu "$cfg" cpu_port + + # ... if unspecified, find first CPU port + if [ -z "$cpu" ]; then + local e + for e in /sys/class/net/*/dsa; do + if [ -d "$e" ]; then + cpu=${e%/dsa} + cpu=${cpu##*/} + break + fi + done + fi + + # Bail out if we cannot determine the CPU port + if [ -z "$cpu" ]; then + warn "Unable to determine CPU port for switch '$cfg'" + return 1 + fi + + append switch_names "$cfg" + + # Prevent netifd from picking up our switch bridge just yet + network_defer_device "$cfg" + + # Increase MTU of CPU port to 1508 to accomodate for VID + DSA tag + ip link set "$cpu" mtu 1508 + ip link set "$cpu" up + + # (Re)create switch bridge device in case it is not yet set up + local filtering=$(cat "/sys/class/net/$cfg/bridge/vlan_filtering" 2>/dev/null) + if [ ${filtering:-0} != 1 ]; then + ip link set "$cfg" down 2>/dev/null + ip link delete dev "$cfg" 2>/dev/null + ip link add name "$cfg" type bridge + echo 1 > "/sys/class/net/$cfg/bridge/vlan_filtering" + fi + + ip link set "$cfg" up + + # Unbridge DSA ports and flush any VLAN filters on them, they're added back later + local port + for port in /sys/class/net/*"/upper_${cfg}"; do + if [ -e "$port" ]; then + port=${port%/upper_*} + port=${port##*/} + + ip link set "$port" nomaster + + # Unbridging the port should already clear VLANs, but be safe + clear_port_vlans "$port" + fi + done + + # Clear any VLANs on the switch bridge, they're added back later + clear_port_vlans "$cfg" self +} + +setup_switch_vlan() { + local cfg=$1 + local switch vlan ports + + config_get switch "$cfg" switch + config_get vlan "$cfg" vlan + config_get ports "$cfg" ports + + lookup_switch "$cfg" || return 1 + validate_vid "$vlan" || { + warn "VLAN section '$cfg' specifies an invalid VLAN ID '$vlan'" + return 1 + } + + # Setup ports + local port tag pvid + for port in $ports; do + tag=${port#*.} + port=${port%.*} + pvid= + + if [ "$tag" != "$port" ] && [ "$tag" = t ]; then + tag=tagged + else + tag=untagged + fi + + # Add the port to the switch bridge and delete the default + # VLAN 1 if it is not yet joined to the switch. + if [ ! -e "/sys/class/net/$port/upper_$switch" ]; then + ip link set dev "$port" up + ip link set dev "$port" master "$switch" + + # Get rid of default VLAN 1 + bridge vlan del vid 1 dev "$port" + fi + + # Promote the first untagged VLAN of this port to the PVID + if [ "$tag" = untagged ] && ! bridge vlan show dev "$port" | grep -qi pvid; then + pvid=pvid + fi + + # Add VLAN filter entry for port + bridge vlan add dev "$port" vid $vlan $pvid $tag + done + + # Make the switch bridge itself handle the VLAN as well + bridge vlan add dev "$switch" self vid $vlan tagged +} + +setup_switch_port() { + local cfg=$1 + local switch port pvid tag + + config_get port "$cfg" port + config_get pvid "$cfg" pvid + + lookup_switch "$cfg" || return 1 + validate_vid "$pvid" || { + warn "Port section '$cfg' specifies an invalid PVID '$pvid'" + return 1 + } + + # Disallow setting the PVID of the switch bridge itself + [ "$port" != "$switch" ] || { + warn "Port section '$cfg' must not change PVID of the switch bridge" + return 1 + } + + # Determine existing VLAN config + local vlanspec=$(bridge vlan show dev "$port" vid "$pvid" 2>/dev/null | sed -ne2p) + echo "$vlanspec" | grep -qi untagged && tag=untagged || tag=tagged + + bridge vlan add vid "$pvid" dev "$port" pvid $tag +} + +apply_config() { + config_load network + config_foreach setup_switch dsa + + # If no switch is explicitely declared, synthesize switch0 + if [ -z "$switch_names" ] && ! setup_switch switch0; then + warn "No DSA switches found" + return 1 + fi + + config_foreach setup_switch_vlan dsa_vlan + config_foreach setup_switch_port dsa_port + + # Ready switch bridge devices + local switch + for switch in $switch_names; do + network_ready_device "$switch" + done +} + +show_switch() { + local switch=$1 + + printf "Switch: %s\n" "$switch" + printf "VLAN/" + + local port ports + for port in "/sys/class/net/$switch/lower_"*; do + port=${port##*/lower_} + + + printf " | %-5s" "$port" + append ports "$port" + done + + printf " |\nLink:" + + for port in $ports; do + local carrier=$(cat "/sys/class/net/$port/carrier") + local duplex=$(cat "/sys/class/net/$port/duplex") + local speed=$(cat "/sys/class/net/$port/speed") + + if [ ${carrier:-0} -eq 0 ]; then + printf " | %-5s" "down" + else + [ "$duplex" = "full" ] && duplex=F || duplex=H + printf " | %4d%s" "$speed" "$duplex" + fi + done + + local vlans=$(bridge vlan show dev "$switch" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') + local vlan + for vlan in $vlans; do + printf " |\n%4d " "$vlan" + + for port in $ports; do + local pvid="" utag="" word + for word in $(bridge vlan show dev "$port" vid "$vlan"); do + case "$word" in + PVID) pvid="*" ;; + "$vlan") utag="t" ;; + Untagged) utag="u" ;; + esac + done + + printf " | %-2s " "$utag$pvid" + done + done + + printf " |\n\n" +} + +add_switch() { + append switch_names "$1" +} + +show_config() { + config_load network + config_foreach add_switch dsa + + local switch + for switch in ${switch_names:-switch0}; do + show_switch "$switch" + done +} + + +case "$1" in + show) show_config ;; + apply) apply_config ;; + *) + echo "Usage: ${0##*/} show" + echo " ${0##*/} apply" + exit 1 + ;; +esac From 34553e8cc9ad4530d3f52c3423e5c52fdacac539 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 23 Jul 2020 12:50:48 +0200 Subject: [PATCH 07/45] add vfconfig Signed-off-by: Jo-Philipp Wich --- package/network/config/vfconfig/Makefile | 40 +++ .../config/vfconfig/files/vfconfig.hotplug | 7 + .../config/vfconfig/files/vfconfig.include | 11 + .../network/config/vfconfig/files/vfconfig.sh | 234 ++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 package/network/config/vfconfig/Makefile create mode 100644 package/network/config/vfconfig/files/vfconfig.hotplug create mode 100755 package/network/config/vfconfig/files/vfconfig.include create mode 100755 package/network/config/vfconfig/files/vfconfig.sh diff --git a/package/network/config/vfconfig/Makefile b/package/network/config/vfconfig/Makefile new file mode 100644 index 0000000000..1fb62d728f --- /dev/null +++ b/package/network/config/vfconfig/Makefile @@ -0,0 +1,40 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=vfconfig +PKG_RELEASE:=1 +PKG_LICENSE:=GPL-2.0 + +include $(INCLUDE_DIR)/package.mk + +define Package/vfconfig + SECTION:=net + CATEGORY:=Network + MAINTAINER:=Jo-Philipp Wich + TITLE:=UCI configuration support for VLAN filtering rules + DEPENDS:= +ip-bridge +ip-full + PKGARCH:=all +endef + +define Package/vfconfig/description + This package provides UCI configuration abstraction for VLAN filter rules + on top of Linux bridge interfaces. +endef + +define Build/Compile +endef + +define Build/Configure +endef + +define Package/vfconfig/install + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/vfconfig.hotplug $(1)/etc/hotplug.d/iface/01-vfconfig + + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_DATA) ./files/vfconfig.include $(1)/lib/network/vfconfig.sh + + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/vfconfig.sh $(1)/sbin/vfconfig +endef + +$(eval $(call BuildPackage,vfconfig)) diff --git a/package/network/config/vfconfig/files/vfconfig.hotplug b/package/network/config/vfconfig/files/vfconfig.hotplug new file mode 100644 index 0000000000..fc2a489dea --- /dev/null +++ b/package/network/config/vfconfig/files/vfconfig.hotplug @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$ACTION" = ifup ] && [ "$INTERFACE" = loopback ]; then + . /lib/network/dsaconfig.sh + setup_switch +fi + diff --git a/package/network/config/vfconfig/files/vfconfig.include b/package/network/config/vfconfig/files/vfconfig.include new file mode 100755 index 0000000000..4ac11d8061 --- /dev/null +++ b/package/network/config/vfconfig/files/vfconfig.include @@ -0,0 +1,11 @@ +#!/bin/sh + +setup_switch() { + # Skip switch setup on network restart. The netifd process + # will be started afterwards and remove all interfaces again... + if [ "$initscript" = /etc/init.d/network ] && [ "$action" = restart ]; then + return 0 + fi + + /sbin/dsaconfig apply 2>&1 | logger -t dsaconfig +} diff --git a/package/network/config/vfconfig/files/vfconfig.sh b/package/network/config/vfconfig/files/vfconfig.sh new file mode 100755 index 0000000000..5a73c62b27 --- /dev/null +++ b/package/network/config/vfconfig/files/vfconfig.sh @@ -0,0 +1,234 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/network.sh + +bridge_names="" + +warn() { + echo "$@" >&2 +} + +clear_port_vlans() { + local port=$1 + local self=$2 + local vlans=$(bridge vlan show dev "$port" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') + + local vlan + for vlan in $vlans; do + bridge vlan del vid "$vlan" dev "$port" $self + done +} + +add_bridge() { + local cfg=$1 + local brname + + config_get brname "$cfg" bridge "switch0" + + case " $bridge_names " in + *" $brname "*) return 1 ;; + esac + + append bridge_names "$brname" + + export -n "bridge=$brname" +} + +validate_vid() { + local vid=$1 + + case "$vid" in + [1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-4][0-9][0-9][0-9]) + if [ $vid -gt 4096 ]; then + return 1 + fi + ;; + *) + return 1 + ;; + esac + + return 0 +} + +setup_bridge() { + local cfg=$1 + local bridge + + add_bridge "$cfg" || return 0 + + # Prevent netifd from picking up our switch bridge just yet + network_defer_device "$bridge" + + # (Re)create switch bridge device in case it is not yet set up + local filtering=$(cat "/sys/class/net/$bridge/bridge/vlan_filtering" 2>/dev/null) + if [ ${filtering:-0} != 1 ]; then + ip link set "$bridge" down 2>/dev/null + ip link delete dev "$bridge" 2>/dev/null + ip link add name "$bridge" type bridge + echo 1 > "/sys/class/net/$bridge/bridge/vlan_filtering" + fi + + ip link set "$bridge" up + + # Unbridge DSA ports and flush any VLAN filters on them, they're added back later + local port + for port in /sys/class/net/*"/upper_${cfg}"; do + if [ -e "$port" ]; then + port=${port%/upper_*} + port=${port##*/} + + ip link set "$port" nomaster + + # Unbridging the port should already clear VLANs, but be safe + clear_port_vlans "$port" + fi + done + + # Clear any VLANs on the switch bridge, they're added back later + clear_port_vlans "$bridge" self +} + +setup_bridge_vlan() { + local cfg=$1 + local bridge vlan ports + + config_get bridge "$cfg" bridge "switch0" + config_get vlan "$cfg" vlan + config_get ports "$cfg" ports + + validate_vid "$vlan" || { + warn "VLAN section '$cfg' specifies an invalid VLAN ID '$vlan'" + return 1 + } + + # Setup ports + local port tag pvid + for port in $ports; do + tag=untagged + pvid= + + case "$port" in + *"*") + pvid=pvid + port=${port%\*} + ;; + esac + + case "$port" in + *:u) + port=${port%:u} + ;; + *:t) + tag=tagged + port=${port%:t} + ;; + esac + + # Add the port to the switch bridge and delete the default + # VLAN 1 if it is not yet joined to the bridge. + if [ ! -e "/sys/class/net/$port/upper_$bridge" ]; then + ip link set dev "$port" up + ip link set dev "$port" master "$bridge" + + # Get rid of default VLAN 1 + bridge vlan del vid 1 dev "$port" + fi + + # Promote the first untagged VLAN of this port to the PVID + if [ "$tag" = untagged ] && ! bridge vlan show dev "$port" | grep -qi pvid; then + pvid=pvid + fi + + # Add VLAN filter entry for port + bridge vlan add dev "$port" vid $vlan $pvid $tag + done + + # Make the switch bridge itself handle the VLAN as well + bridge vlan add dev "$bridge" self vid $vlan tagged +} + +apply_config() { + config_load network + config_foreach setup_bridge vlan_filter + config_foreach setup_bridge_vlan vlan_filter + + # Ready switch bridge devices + local bridge + for bridge in $bridge_names; do + network_ready_device "$bridge" + done +} + +show_bridge() { + local cfg=$1 + local bridge + + add_bridge "$cfg" || return 0 + + printf "Bridge: %s\n" "$bridge" + printf "VLAN/" + + local port ports + for port in "/sys/class/net/$bridge/lower_"*; do + [ -e "$port" ] || continue + + port=${port##*/lower_} + + printf " | %-5s" "$port" + append ports "$port" + done + + printf " |\nLink:" + + for port in $ports; do + local carrier=$(cat "/sys/class/net/$port/carrier") + local duplex=$(cat "/sys/class/net/$port/duplex") + local speed=$(cat "/sys/class/net/$port/speed") + + if [ ${carrier:-0} -eq 0 ]; then + printf " | %-5s" "down" + else + [ "$duplex" = "full" ] && duplex=F || duplex=H + printf " | %4d%s" "$speed" "$duplex" + fi + done + + local vlans=$(bridge vlan show dev "$bridge" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') + local vlan + for vlan in $vlans; do + printf " |\n%4d " "$vlan" + + for port in $ports; do + local pvid="" utag="" word + for word in $(bridge vlan show dev "$port" vid "$vlan"); do + case "$word" in + PVID) pvid="*" ;; + "$vlan") utag="t" ;; + Untagged) utag="u" ;; + esac + done + + printf " | %-2s " "$utag$pvid" + done + done + + printf " |\n\n" +} + +show_config() { + config_load network + config_foreach show_bridge vlan_filter +} + + +case "$1" in + show) show_config ;; + apply) apply_config ;; + *) + echo "Usage: ${0##*/} show" + echo " ${0##*/} apply" + exit 1 + ;; +esac From b92f54b919e925cf27105c22f8ffdd7585937bb1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 5 Aug 2020 09:25:41 +0200 Subject: [PATCH 08/45] openvpn: fix arguments passing to wrapped up and down scripts With the introduction of the generic OpenVPN hotplug mechanism, wrapped --up and --down scripts got the wrong amount and order of arguments passed, breaking existing configurations and functionality. Fix this issue by passing the same amount of arguments in the same expected order as if the scripts were executed by the OpenVPN daemon directly. Ref: https://github.com/openwrt/openwrt/pull/1596#issuecomment-668935156 Fixes: 8fe9940db6 ("openvpn: add generic hotplug mechanism") Signed-off-by: Jo-Philipp Wich --- package/network/services/openvpn/Makefile | 2 +- .../services/openvpn/files/etc/hotplug.d/openvpn/01-user | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 8126b3a7c7..9482e9ce39 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.4.9 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ diff --git a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user index 86be69e805..f93823e5c5 100644 --- a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user +++ b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user @@ -13,7 +13,8 @@ case "$ACTION" in up|down) if get_openvpn_option "$config" command "$ACTION"; then - exec /bin/sh -c "$command $ACTION $INSTANCE $*" + shift + exec /bin/sh -c "$command $*" fi ;; esac From 25e0ae6bfc3bdc05795b988c0b4faec993d71157 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 10 Jun 2020 16:52:27 +0200 Subject: [PATCH 09/45] mac80211: make cfg80211 testmode support optional (and disabled by default) Testmode commands are typically only used for manufacturing or vendor specific debugging features, so they should not be in the default image Signed-off-by: Felix Fietkau --- package/kernel/mac80211/Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 75d9cd9e6f..6a79949612 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -35,6 +35,7 @@ PKG_DRIVERS = \ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-mac80211 \ + CONFIG_PACKAGE_CFG80211_TESTMODE \ CONFIG_PACKAGE_MAC80211_DEBUGFS \ CONFIG_PACKAGE_MAC80211_MESH \ CONFIG_PACKAGE_MAC80211_TRACING \ @@ -56,7 +57,6 @@ config_package=$(if $(CONFIG_PACKAGE_kmod-$(1)),m) config-y:= \ WLAN \ - NL80211_TESTMODE \ CFG80211_WEXT \ CFG80211_CERTIFICATION_ONUS \ MAC80211_RC_MINSTREL \ @@ -80,6 +80,7 @@ config-y:= \ WLAN_VENDOR_ZYDAS \ config-$(call config_package,cfg80211) += CFG80211 +config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE config-$(call config_package,mac80211) += MAC80211 config-$(CONFIG_PACKAGE_MAC80211_MESH) += MAC80211_MESH @@ -108,6 +109,20 @@ define KernelPackage/cfg80211/description cfg80211 is the Linux wireless LAN (802.11) configuration API. endef +define KernelPackage/cfg80211/config + if PACKAGE_kmod-cfg80211 + + config PACKAGE_CFG80211_TESTMODE + bool "Enable testmode command support" + default n + help + This is typically used for tests and calibration during + manufacturing, or vendor specific debugging features + + endif +endef + + define KernelPackage/mac80211 $(call KernelPackage/mac80211/Default) TITLE:=Linux 802.11 Wireless Networking Stack From eb155f755a0e4308d8b08621649fd76bb917105c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Jun 2020 21:44:37 +0200 Subject: [PATCH 10/45] build: make prefix mapping of debug information optional Remapping the local build path in debug information makes debugging using ./scripts/remote-gdb harder, because files no longer refer to the full path on the build host. For local builds, debug information does not need to be reproducible, since it will be stripped out of packages anyway. For buildbot builds, it makes sense to keep debug information reproducible, since the full path is not needed (nor desired) anywhere. Signed-off-by: Felix Fietkau --- config/Config-build.in | 9 +++++++++ rules.mk | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/Config-build.in b/config/Config-build.in index 199277167b..499f84690f 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -103,6 +103,15 @@ menu "Global build settings" help If enabled, buildinfo files will be stored in /etc/build.* of firmware. + config REPRODUCIBLE_DEBUG_INFO + bool "Make debug information reproducible" + default BUILDBOT + help + This strips the local build path out of debug information. This has the + advantage of making it reproducible, but the disadvantage of making local + debugging using ./scripts/remote-gdb harder, since the debug data will + no longer point to the full path on the build host. + config COLLECT_KERNEL_DEBUG bool prompt "Collect kernel debug information" diff --git a/rules.mk b/rules.mk index e734b4a582..479172de03 100644 --- a/rules.mk +++ b/rules.mk @@ -144,7 +144,7 @@ ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),) ifeq ($(CONFIG_GCC_USE_IREMAP),y) iremap = -iremap$(1):$(2) else - iremap = -ffile-prefix-map=$(1)=$(2) + iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2) endif endif From b0f7ea2853e26b5999e917253c927bc5d0bd7894 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 20 Jul 2020 17:45:59 +0200 Subject: [PATCH 11/45] kernel: unify CONFIG_GPIO_SYSFS in kernel configs Enable it for all platforms Signed-off-by: Felix Fietkau --- target/linux/apm821xx/config-4.19 | 1 - target/linux/apm821xx/config-5.4 | 1 - target/linux/ar71xx/config-4.14 | 1 - target/linux/archs38/config-5.4 | 1 - target/linux/at91/config-4.14 | 1 - target/linux/ath25/config-4.14 | 1 - target/linux/ath79/config-4.19 | 1 - target/linux/ath79/config-5.4 | 1 - target/linux/bcm27xx/bcm2708/config-5.4 | 1 - target/linux/bcm27xx/bcm2709/config-5.4 | 1 - target/linux/bcm27xx/bcm2710/config-5.4 | 1 - target/linux/bcm27xx/bcm2711/config-5.4 | 1 - target/linux/bcm47xx/config-4.19 | 1 - target/linux/bcm47xx/config-5.4 | 1 - target/linux/bcm53xx/config-4.19 | 1 - target/linux/bcm53xx/config-5.4 | 1 - target/linux/bcm63xx/config-5.4 | 1 - target/linux/cns3xxx/config-4.19 | 1 - target/linux/generic/config-4.14 | 2 +- target/linux/generic/config-4.19 | 2 +- target/linux/generic/config-5.4 | 2 +- target/linux/imx6/config-4.19 | 1 - target/linux/imx6/config-5.4 | 1 - target/linux/ipq40xx/config-4.19 | 1 - target/linux/ipq40xx/config-5.4 | 1 - target/linux/ipq806x/config-4.19 | 1 - target/linux/ipq806x/config-5.4 | 1 - target/linux/ipq807x/config-default | 1 - target/linux/kirkwood/config-5.4 | 1 - target/linux/lantiq/config-4.19 | 1 - target/linux/lantiq/config-5.4 | 1 - target/linux/layerscape/armv8_64b/config-5.4 | 1 - target/linux/mediatek/mt7623/config-4.19 | 1 - target/linux/mediatek/mt7623/config-5.4 | 1 - target/linux/mediatek/mt7629/config-4.19 | 1 - target/linux/mediatek/mt7629/config-5.4 | 1 - target/linux/mpc85xx/config-4.19 | 1 - target/linux/mpc85xx/config-5.4 | 1 - target/linux/mvebu/config-4.19 | 1 - target/linux/mvebu/config-5.4 | 1 - target/linux/mxs/config-5.4 | 1 - target/linux/octeon/config-4.19 | 1 - target/linux/octeon/config-5.4 | 1 - target/linux/omap/config-4.19 | 1 - target/linux/omap/config-5.4 | 1 - target/linux/pistachio/config-4.14 | 1 - target/linux/ramips/mt7620/config-4.14 | 1 - target/linux/ramips/mt7620/config-5.4 | 1 - target/linux/ramips/mt7621/config-5.4 | 1 - target/linux/ramips/mt76x8/config-5.4 | 1 - target/linux/ramips/rt288x/config-4.14 | 1 - target/linux/ramips/rt288x/config-5.4 | 1 - target/linux/ramips/rt305x/config-4.14 | 1 - target/linux/ramips/rt305x/config-5.4 | 1 - target/linux/ramips/rt3883/config-4.14 | 1 - target/linux/ramips/rt3883/config-5.4 | 1 - target/linux/rb532/config-4.14 | 1 - target/linux/sunxi/config-4.19 | 1 - target/linux/sunxi/config-5.4 | 1 - target/linux/tegra/config-4.19 | 1 - target/linux/tegra/config-5.4 | 1 - target/linux/x86/64/config-4.19 | 1 - target/linux/x86/64/config-5.4 | 1 - target/linux/x86/geode/config-4.19 | 1 - target/linux/x86/geode/config-5.4 | 1 - target/linux/zynq/config-4.19 | 1 - target/linux/zynq/config-5.4 | 1 - 67 files changed, 3 insertions(+), 67 deletions(-) diff --git a/target/linux/apm821xx/config-4.19 b/target/linux/apm821xx/config-4.19 index 27385ef1fd..6d4c30b55d 100644 --- a/target/linux/apm821xx/config-4.19 +++ b/target/linux/apm821xx/config-4.19 @@ -130,7 +130,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4 index f2caef0e26..d54eb95d14 100644 --- a/target/linux/apm821xx/config-5.4 +++ b/target/linux/apm821xx/config-5.4 @@ -145,7 +145,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/target/linux/ar71xx/config-4.14 b/target/linux/ar71xx/config-4.14 index 9a524fae43..147be5e2d2 100644 --- a/target/linux/ar71xx/config-4.14 +++ b/target/linux/ar71xx/config-4.14 @@ -330,7 +330,6 @@ CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_LATCH is not set CONFIG_GPIO_NXP_74HC153=y CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/archs38/config-5.4 b/target/linux/archs38/config-5.4 index ab03472cd7..d98ba4ce32 100644 --- a/target/linux/archs38/config-5.4 +++ b/target/linux/archs38/config-5.4 @@ -122,7 +122,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_SNPS_CREG=y -CONFIG_GPIO_SYSFS=y CONFIG_GRACE_PERIOD=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HAS_DMA=y diff --git a/target/linux/at91/config-4.14 b/target/linux/at91/config-4.14 index b1b49054ab..b4fc644015 100644 --- a/target/linux/at91/config-4.14 +++ b/target/linux/at91/config-4.14 @@ -211,7 +211,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/ath25/config-4.14 b/target/linux/ath25/config-4.14 index 4d3f0c697e..734f598cd0 100644 --- a/target/linux/ath25/config-4.14 +++ b/target/linux/ath25/config-4.14 @@ -62,7 +62,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_AR2315=y CONFIG_GPIO_AR5312=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/ath79/config-4.19 b/target/linux/ath79/config-4.19 index c1b15301ef..eaaedd6c51 100644 --- a/target/linux/ath79/config-4.19 +++ b/target/linux/ath79/config-4.19 @@ -81,7 +81,6 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y CONFIG_GPIO_ATH79=y CONFIG_GPIO_GENERIC=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4 index f0679933ae..6ef32cfefa 100644 --- a/target/linux/ath79/config-5.4 +++ b/target/linux/ath79/config-5.4 @@ -90,7 +90,6 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y CONFIG_GPIO_ATH79=y CONFIG_GPIO_GENERIC=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4 index 1f3fbbdf3a..ccc2b69556 100644 --- a/target/linux/bcm27xx/bcm2708/config-5.4 +++ b/target/linux/bcm27xx/bcm2708/config-5.4 @@ -205,7 +205,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_GPIO_BCM_VIRT is not set CONFIG_GPIO_RASPBERRYPI_EXP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4 index 2d4e438ced..ce873e213d 100644 --- a/target/linux/bcm27xx/bcm2709/config-5.4 +++ b/target/linux/bcm27xx/bcm2709/config-5.4 @@ -260,7 +260,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_BCM_VIRT=y CONFIG_GPIO_RASPBERRYPI_EXP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4 index aa9be56ca2..b1923da347 100644 --- a/target/linux/bcm27xx/bcm2710/config-5.4 +++ b/target/linux/bcm27xx/bcm2710/config-5.4 @@ -308,7 +308,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_BCM_VIRT=y CONFIG_GPIO_RASPBERRYPI_EXP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4 index 935a06fb72..9c09fb02af 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.4 +++ b/target/linux/bcm27xx/bcm2711/config-5.4 @@ -314,7 +314,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_BCM_VIRT=y CONFIG_GPIO_RASPBERRYPI_EXP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/bcm47xx/config-4.19 b/target/linux/bcm47xx/config-4.19 index 8f679b377f..2747efc04d 100644 --- a/target/linux/bcm47xx/config-4.19 +++ b/target/linux/bcm47xx/config-4.19 @@ -83,7 +83,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WDT=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/bcm47xx/config-5.4 b/target/linux/bcm47xx/config-5.4 index 8f679b377f..2747efc04d 100644 --- a/target/linux/bcm47xx/config-5.4 +++ b/target/linux/bcm47xx/config-5.4 @@ -83,7 +83,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WDT=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/bcm53xx/config-4.19 b/target/linux/bcm53xx/config-4.19 index f592a15401..2531a86046 100644 --- a/target/linux/bcm53xx/config-4.19 +++ b/target/linux/bcm53xx/config-4.19 @@ -162,7 +162,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4 index ff2e7e886a..ea10eba992 100644 --- a/target/linux/bcm53xx/config-5.4 +++ b/target/linux/bcm53xx/config-5.4 @@ -173,7 +173,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/bcm63xx/config-5.4 b/target/linux/bcm63xx/config-5.4 index c1587b84d6..6c2cbb4cc3 100644 --- a/target/linux/bcm63xx/config-5.4 +++ b/target/linux/bcm63xx/config-5.4 @@ -107,7 +107,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_BCM63XX=y CONFIG_GPIO_GENERIC=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/cns3xxx/config-4.19 b/target/linux/cns3xxx/config-4.19 index b92b1e2aef..9b9aea461b 100644 --- a/target/linux/cns3xxx/config-4.19 +++ b/target/linux/cns3xxx/config-4.19 @@ -118,7 +118,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index d9b90f304e..778eee008b 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -1574,7 +1574,7 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SYSCON is not set -# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set # CONFIG_GPIO_TS5500 is not set diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index a197d82cda..977829c867 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -1673,7 +1673,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512 # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SYSCON is not set -# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set # CONFIG_GPIO_TS5500 is not set diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 6e49ceefca..3279aabe64 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -1800,7 +1800,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512 # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SYSCON is not set -# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_TPIC2810 is not set # CONFIG_GPIO_TS4900 is not set # CONFIG_GPIO_TS5500 is not set diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19 index 9ba1d02b93..3b9b20ace1 100644 --- a/target/linux/imx6/config-4.19 +++ b/target/linux/imx6/config-4.19 @@ -233,7 +233,6 @@ CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MXC=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4 index bb8a80de74..fa397829f2 100644 --- a/target/linux/imx6/config-5.4 +++ b/target/linux/imx6/config-5.4 @@ -238,7 +238,6 @@ CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MXC=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index 919f336fb7..c70c761d25 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -198,7 +198,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WATCHDOG=y CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y CONFIG_HANDLE_DOMAIN_IRQ=y diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4 index 7900c9c04c..6cbd9f9500 100644 --- a/target/linux/ipq40xx/config-5.4 +++ b/target/linux/ipq40xx/config-5.4 @@ -214,7 +214,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WATCHDOG=y CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y CONFIG_HANDLE_DOMAIN_IRQ=y diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index bdbfca1501..f61883a6db 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -180,7 +180,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4 index 794ce95042..263d153dde 100644 --- a/target/linux/ipq806x/config-5.4 +++ b/target/linux/ipq806x/config-5.4 @@ -186,7 +186,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GRO_CELLS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/ipq807x/config-default b/target/linux/ipq807x/config-default index e526128483..1f60ccfecb 100644 --- a/target/linux/ipq807x/config-default +++ b/target/linux/ipq807x/config-default @@ -272,7 +272,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4 index 61efa07d91..a39137a29f 100644 --- a/target/linux/kirkwood/config-5.4 +++ b/target/linux/kirkwood/config-5.4 @@ -140,7 +140,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIO_MVEBU=y -CONFIG_GPIO_SYSFS=y CONFIG_GRO_CELLS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/lantiq/config-4.19 b/target/linux/lantiq/config-4.19 index 3d603dbd68..7510e357a2 100644 --- a/target/linux/lantiq/config-4.19 +++ b/target/linux/lantiq/config-4.19 @@ -67,7 +67,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_MM_LANTIQ=y CONFIG_GPIO_STP_XWAY=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/lantiq/config-5.4 b/target/linux/lantiq/config-5.4 index a1c259b002..a8975864c8 100644 --- a/target/linux/lantiq/config-5.4 +++ b/target/linux/lantiq/config-5.4 @@ -76,7 +76,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_MM_LANTIQ=y CONFIG_GPIO_STP_XWAY=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4 index a8025dac23..40bf4a9c5c 100644 --- a/target/linux/layerscape/armv8_64b/config-5.4 +++ b/target/linux/layerscape/armv8_64b/config-5.4 @@ -420,7 +420,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MPC8XXX=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/mediatek/mt7623/config-4.19 b/target/linux/mediatek/mt7623/config-4.19 index 994768bb64..56ae95cc31 100644 --- a/target/linux/mediatek/mt7623/config-4.19 +++ b/target/linux/mediatek/mt7623/config-4.19 @@ -207,7 +207,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4 index 83ff7b3111..dc93a65566 100644 --- a/target/linux/mediatek/mt7623/config-5.4 +++ b/target/linux/mediatek/mt7623/config-5.4 @@ -216,7 +216,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/mediatek/mt7629/config-4.19 b/target/linux/mediatek/mt7629/config-4.19 index 7bf014d151..e36b00d485 100644 --- a/target/linux/mediatek/mt7629/config-4.19 +++ b/target/linux/mediatek/mt7629/config-4.19 @@ -141,7 +141,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y # CONFIG_HARDENED_USERCOPY is not set CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4 index 1dbf1787cb..a291b9a263 100644 --- a/target/linux/mediatek/mt7629/config-5.4 +++ b/target/linux/mediatek/mt7629/config-5.4 @@ -150,7 +150,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y # CONFIG_HARDENED_USERCOPY is not set CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/mpc85xx/config-4.19 b/target/linux/mpc85xx/config-4.19 index 67f4134d25..e999417d1e 100644 --- a/target/linux/mpc85xx/config-4.19 +++ b/target/linux/mpc85xx/config-4.19 @@ -118,7 +118,6 @@ CONFIG_GIANFAR=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MPC8XXX=y -CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4 index 340d5ece99..8e01def3f9 100644 --- a/target/linux/mpc85xx/config-5.4 +++ b/target/linux/mpc85xx/config-5.4 @@ -118,7 +118,6 @@ CONFIG_GIANFAR=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MPC8XXX=y -CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/target/linux/mvebu/config-4.19 b/target/linux/mvebu/config-4.19 index 3de6296a8d..f2083f4f16 100644 --- a/target/linux/mvebu/config-4.19 +++ b/target/linux/mvebu/config-4.19 @@ -215,7 +215,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MVEBU=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/mvebu/config-5.4 b/target/linux/mvebu/config-5.4 index 9739ee62ae..a13cb8d9e5 100644 --- a/target/linux/mvebu/config-5.4 +++ b/target/linux/mvebu/config-5.4 @@ -217,7 +217,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MVEBU=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/mxs/config-5.4 b/target/linux/mxs/config-5.4 index 7232234b97..6fa7412cd3 100644 --- a/target/linux/mxs/config-5.4 +++ b/target/linux/mxs/config-5.4 @@ -121,7 +121,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MXS=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y diff --git a/target/linux/octeon/config-4.19 b/target/linux/octeon/config-4.19 index 5b8a21318e..1eb148e757 100644 --- a/target/linux/octeon/config-4.19 +++ b/target/linux/octeon/config-4.19 @@ -97,7 +97,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_OCTEON=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/octeon/config-5.4 b/target/linux/octeon/config-5.4 index e157b5072f..a0644243ce 100644 --- a/target/linux/octeon/config-5.4 +++ b/target/linux/octeon/config-5.4 @@ -102,7 +102,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_OCTEON=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/omap/config-4.19 b/target/linux/omap/config-4.19 index 88ecc1880b..9004dd0ba6 100644 --- a/target/linux/omap/config-4.19 +++ b/target/linux/omap/config-4.19 @@ -283,7 +283,6 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_TPS65218 is not set CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y diff --git a/target/linux/omap/config-5.4 b/target/linux/omap/config-5.4 index fd46a90ccb..1a24943806 100644 --- a/target/linux/omap/config-5.4 +++ b/target/linux/omap/config-5.4 @@ -285,7 +285,6 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_TPS65218 is not set CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14 index bcb9ff4683..8b24b68a05 100644 --- a/target/linux/pistachio/config-4.14 +++ b/target/linux/pistachio/config-4.14 @@ -112,7 +112,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14 index 635b3c67f8..0022bc12c9 100644 --- a/target/linux/ramips/mt7620/config-4.14 +++ b/target/linux/ramips/mt7620/config-4.14 @@ -76,7 +76,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y # CONFIG_GPIO_MT7621 is not set CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/ramips/mt7620/config-5.4 b/target/linux/ramips/mt7620/config-5.4 index edeff27472..d1170ce036 100644 --- a/target/linux/ramips/mt7620/config-5.4 +++ b/target/linux/ramips/mt7620/config-5.4 @@ -89,7 +89,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y # CONFIG_GPIO_MT7621 is not set CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4 index b2c3ad5ba8..b4c8ab1f1c 100644 --- a/target/linux/ramips/mt7621/config-5.4 +++ b/target/linux/ramips/mt7621/config-5.4 @@ -106,7 +106,6 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MT7621=y # CONFIG_GPIO_RALINK is not set -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WATCHDOG=y # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set CONFIG_HANDLE_DOMAIN_IRQ=y diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4 index cdc357e212..ec21b3722b 100644 --- a/target/linux/ramips/mt76x8/config-5.4 +++ b/target/linux/ramips/mt76x8/config-5.4 @@ -89,7 +89,6 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MT7621=y # CONFIG_GPIO_RALINK is not set -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14 index 44b20edad6..30c0a64cf8 100644 --- a/target/linux/ramips/rt288x/config-4.14 +++ b/target/linux/ramips/rt288x/config-4.14 @@ -66,7 +66,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/ramips/rt288x/config-5.4 b/target/linux/ramips/rt288x/config-5.4 index a999726d84..6c0725aed9 100644 --- a/target/linux/ramips/rt288x/config-5.4 +++ b/target/linux/ramips/rt288x/config-5.4 @@ -77,7 +77,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ramips/rt305x/config-4.14 b/target/linux/ramips/rt305x/config-4.14 index 75ca7f9469..a826bad38e 100644 --- a/target/linux/ramips/rt305x/config-4.14 +++ b/target/linux/ramips/rt305x/config-4.14 @@ -59,7 +59,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ramips/rt305x/config-5.4 b/target/linux/ramips/rt305x/config-5.4 index 82b842e6b5..3f93a9db88 100644 --- a/target/linux/ramips/rt305x/config-5.4 +++ b/target/linux/ramips/rt305x/config-5.4 @@ -81,7 +81,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14 index 2eda81f160..83b9fdb6f3 100644 --- a/target/linux/ramips/rt3883/config-4.14 +++ b/target/linux/ramips/rt3883/config-4.14 @@ -70,7 +70,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y diff --git a/target/linux/ramips/rt3883/config-5.4 b/target/linux/ramips/rt3883/config-5.4 index 356a57104d..09d51fdbdd 100644 --- a/target/linux/ramips/rt3883/config-5.4 +++ b/target/linux/ramips/rt3883/config-5.4 @@ -81,7 +81,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y diff --git a/target/linux/rb532/config-4.14 b/target/linux/rb532/config-4.14 index a02dc03bb3..257b4e2d6c 100644 --- a/target/linux/rb532/config-4.14 +++ b/target/linux/rb532/config-4.14 @@ -60,7 +60,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/sunxi/config-4.19 b/target/linux/sunxi/config-4.19 index 9f3930303b..57063d3e0b 100644 --- a/target/linux/sunxi/config-4.19 +++ b/target/linux/sunxi/config-4.19 @@ -226,7 +226,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4 index 1e54e980a3..9b884d5cae 100644 --- a/target/linux/sunxi/config-5.4 +++ b/target/linux/sunxi/config-5.4 @@ -227,7 +227,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y diff --git a/target/linux/tegra/config-4.19 b/target/linux/tegra/config-4.19 index ea2177a865..84e3ada8ba 100644 --- a/target/linux/tegra/config-4.19 +++ b/target/linux/tegra/config-4.19 @@ -242,7 +242,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TEGRA=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4 index 5313e39894..e7722b9bc6 100644 --- a/target/linux/tegra/config-5.4 +++ b/target/linux/tegra/config-5.4 @@ -257,7 +257,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TEGRA=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19 index eafae899dd..8de25d556f 100644 --- a/target/linux/x86/64/config-4.19 +++ b/target/linux/x86/64/config-4.19 @@ -221,7 +221,6 @@ CONFIG_GPIO_ICH=y # CONFIG_GPIO_IT87 is not set CONFIG_GPIO_LYNXPOINT=y CONFIG_GPIO_SCH=y -CONFIG_GPIO_SYSFS=y CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4 index 1b44103d11..8d40d99ee9 100644 --- a/target/linux/x86/64/config-5.4 +++ b/target/linux/x86/64/config-5.4 @@ -195,7 +195,6 @@ CONFIG_GPIO_ICH=y # CONFIG_GPIO_IT87 is not set CONFIG_GPIO_LYNXPOINT=y CONFIG_GPIO_SCH=y -CONFIG_GPIO_SYSFS=y CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y diff --git a/target/linux/x86/geode/config-4.19 b/target/linux/x86/geode/config-4.19 index 1f8627aa6a..316111aa0e 100644 --- a/target/linux/x86/geode/config-4.19 +++ b/target/linux/x86/geode/config-4.19 @@ -46,7 +46,6 @@ CONFIG_GEOS=y CONFIG_GPIOLIB=y CONFIG_GPIO_ACPI=y CONFIG_GPIO_CS5535=y -CONFIG_GPIO_SYSFS=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y # CONFIG_HPET is not set diff --git a/target/linux/x86/geode/config-5.4 b/target/linux/x86/geode/config-5.4 index 1f8627aa6a..316111aa0e 100644 --- a/target/linux/x86/geode/config-5.4 +++ b/target/linux/x86/geode/config-5.4 @@ -46,7 +46,6 @@ CONFIG_GEOS=y CONFIG_GPIOLIB=y CONFIG_GPIO_ACPI=y CONFIG_GPIO_CS5535=y -CONFIG_GPIO_SYSFS=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y # CONFIG_HPET is not set diff --git a/target/linux/zynq/config-4.19 b/target/linux/zynq/config-4.19 index 9b5b16331d..6122dcfd52 100644 --- a/target/linux/zynq/config-4.19 +++ b/target/linux/zynq/config-4.19 @@ -250,7 +250,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ZYNQ=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4 index f201f526b4..ccd2a75663 100644 --- a/target/linux/zynq/config-5.4 +++ b/target/linux/zynq/config-5.4 @@ -264,7 +264,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ZYNQ=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y From bab0d1c33c5b2c3ed7a02ed840d22f7dd3624619 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Jun 2020 21:51:46 +0200 Subject: [PATCH 12/45] mt76: update to 2020-07-22 7bc58ca2b375 mt76: add missing lock configuring coverage class 43febd452110 mt76: mt7615: fix lmac queue debugsfs entry 0b9975254694 mt76: mt7615: fix hw queue mapping 4058595e146e mt76: overwrite qid for non-bufferable mgmt frames 49c7131dd0c5 mt76: mt76x02: do not access uninitialized NAPI structs f185d90ec51c update mt7915 firmware to the latest version 0ed6a335ebc2 mt76: mt7615: re-enable offloading of sequence number assignment 2a52eabbddc5 mt76: usb: rely on mt76_for_each_q_rx 90fc1d8614e1 mt76: mt7663: introduce ARP filter offload b57223dd01b9 mt76: mt7615: fix up typo in Kconfig for MT7663U ec4057d685c0 mt76: add script for generating single-sku device tree data 769b030de636 mt76: add functions for parsing rate power limits from DT 1d2aedb248d0 mt76: extend DT rate power limits to support 11ax devices a3e17ff8e624 mt76: mt7615: implement support for using DT rate power limits a48a4ae32d48 mt76: allow more channels, allowed in ETSI domain 869ba618ef54 mt76: fix include in pci.h b1ddec840aa4 mt76: rely on register macros d6d9a7ea428d mt76: add U-APSD support on AP side ee13b78367db mt76: mt7615: fix EEPROM buffer size 82a94173b162 mt76: mt7915: add missing CONFIG_MAC80211_DEBUGFS c0dbbd930d32 mt76: mt7615: add .set_tsf callback 84d54df76996 mt76: mt7915: add a fixed AC queue mapping dacc2d29672d mt76: mt7915: add MU-MIMO support 1ce4660a0ea3 mt76: mt7915: use ieee80211_tx_queue_params to avoid open coded 53891242a682 mt76: mt7915: add support for DT rate power limits b3a4d78914f6 mt76: mt7915: rework the flow of txpower setting c6ea163c019b mt76: mt7915: directly read per-rate tx power from registers 8ae83adc73a8 mt76: mt7915: overwrite qid for non-bufferable mgmt frames 740b0bfdf279 mt76: mt76x2e: rename routines in pci.c b5eee1b52234 mt76: mt7615: schedule tx tasklet and sta poll on mac tx free 72f34107248e mt76: mt7615: add support for accessing mapped registers via bus ops 46bc8a0b5347 mt76: mt7615: add support for accessing RF registers via MCU 882cec420609 mt76: mt7615: use full on-chip memory address for WF_PHY registers b1ddb8e35ca2 mt76: vif_mask to struct mt76_phy 3a1ea7287eb2 mt76: add API for testmode support d7467bc018e5 mt76: mt7615: implement testmode support 3ea5da1639fe add utility for using testmode support 6789a2db7246 mt7615: fix getting wideband RSSI in test mode 7941217ffe46 mt76: mt7915: remove unused parameters in mt7915_puts_rate_txpower() 13ab1d648684 mt76: mt7915: update HE capabilities 3f0e66dc25de mt76: mt76x2: fix pci suspend/resume on mt7612e c605f2b6940b mt76: mt76x2u: enable HC-M7662BU1 ca2b797ee52d mt76: mt7915: avoid memcpy in rxv operation dad3f93e8f6a mt76: mt7615: avoid polling in fw_own for mt7663 ec303bfad299 mt76: move mt76 workqueue in common code 0bf82270568a mt76: mt7615: add mt7615_pm_wake utility routine 091e9b5df6af mt76: mt7615: introduce mt7615_mutex_{acquire,release} utilities e3850966d74c mt76: mt7615: wake device before accessing regmap in debugfs e6dcb71d7992 mt76: mt7615: wake device before configuring hw keys 050f8cd9cbe7 mt76: mt7615: introduce pm_power_save delayed work 56779a6c7dec mt76: mt7615: wake device in mt7615_update_channel before access regmap b0bcdd66ccaa mt76: mt7615: acquire driver_own before configuring device for suspend 58369fdce235 mt76: mt7615: wake device before performing freq scan 2c188db1f7c7 mt76: mt7615: add missing lock in mt7615_regd_notifier 6fdb20a025eb mt76: mt7615: run mt7615_mcu_set_wmm holding mt76 mutex 36a789c00e4f mt76: mt7615: run mt7615_mcu_set_roc holding mt76 mutex b8cdce45c131 mt76: mt7615: wake device before pulling packets from mac80211 queues 82e8e0525d6c mt76: mt7615: wake device before pushing frames in mt7615_tx 65ccc40c14e1 mt76: mt7615: run mt7615_pm_wake in mt7615_mac_sta_{add,remove} 2107caf92e71 mt76: mt7615: check MT76_STATE_PM flag before accessing the device 28a2f5fa6eed mt76: mt7615: do not request {driver,fw}_own if already granted 94519eac69c3 mt76: mt7615: add runtime-pm knob in mt7615 debugfs ccc90dafea66 mt76: mt7615: enable beacon hw filter for runtime-pm 29f2bebe1a1e mt76: mt7615: add idle-timeout knob in mt7615 debugfs 58057d1f232b mt76: mt7615: improve mt7615_driver_own reliability a873b7c8e3de mt76: mt7663u: sync probe sampling with rate configuration b469c59c616c mt76: mt7615: avoid scheduling runtime-pm during hw scan f1ff52acb6a7 mt76: mt7615: reschedule ps work according to last activity 1f670a534451 mt76: mt7663u: fix memory leak in set key afff00ad2b60 mt76: mt7663u: fix potential memory leak in mcu message handler 4c9309f47ddf mt76: mt7615: fix potential memory leak in mcu message handler 379445b4aa7f mt76: mt7915: potential array overflow in mt7915_mcu_tx_rate_report() 750797b61ba8 mt76: fix copy&paste error in mt76_testmode_cmd f9a7a2f7dbc2 testmode: fix setting tx_power 1641aa201682 mt76: mt7615: fix mt7615_mcu_set_test_param set non-bool parameters 6838d002f9de mt76: mt7615: fix tx_frames setup 8c0a25d6a38c mt76: mt7615: take into account sdio bus configuring txwi c0cbef79eb45 mt76: mt76u: add mt76_skb_adjust_pad utility routine 98412356c959 mt76: mt7615: sdio code must access rate/key regs in preocess context fa16627d7e3a mt76: mt7615: introduce mt7663-usb-sdio-common module bf88e70c7a68 mt76: introduce mt76_sdio module aa97be8e02de mt76: mt7615: introduce mt7663s support 1eb8b7d689a3 mt76: testmode: fix tx_done accounting on enqueue failures 632ce698e8ee mt76: mt7615: fix antenna settings for test mode 4d2f622190b6 mt76: mt76s: move queue accounting in mt76s_tx_queue_skb 9a3723c8febc mt76: mt7915: fix potential memory leak in mcu message handler 88fa973f59c2 mt76: mt7615: fix possible memory leak in mt7615_mcu_wtbl_sta_add 2fff7d77befd mt76: mt76u: add missing release on skb in __mt76x02u_mcu_send_msg b5df0fbb1847 mt7615: update firmware to version 20200629 Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 68 +++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 27b6ed8797..30146f552d 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-05-30 -PKG_SOURCE_VERSION:=85c516081338d3d1454fb53b5741321c2adefbef -PKG_MIRROR_HASH:=a3e110700843ecfee10eba274ab6fe63b9d78a00eb96ee1634b145e0a9ae9a69 +PKG_SOURCE_DATE:=2020-07-22 +PKG_SOURCE_VERSION:=b5df0fbb1847a51f0a11f03a3fa8dc9d98d4df82 +PKG_MIRROR_HASH:=70aca7f8912b89af975c7b63fdf25d41be831c434e0c991fcbdaa60127d4acd5 PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 @@ -23,12 +23,17 @@ PKG_CONFIG_DEPENDS += \ CONFIG_PACKAGE_kmod-mt76x2-common \ CONFIG_PACKAGE_kmod-mt76x2 \ CONFIG_PACKAGE_kmod-mt76x2u \ - CONFIG_PACKAGE_kmod-mt7603 + CONFIG_PACKAGE_kmod-mt7603 \ + CONFIG_PACKAGE_CFG80211_TESTMODE STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +CMAKE_SOURCE_DIR:=$(PKG_BUILD_DIR)/tools +CMAKE_BINARY_DIR:=$(PKG_BUILD_DIR)/tools define KernelPackage/mt76-default SUBMENU:=Wireless Drivers @@ -170,10 +175,29 @@ define KernelPackage/mt7663-firmware-sta TITLE:=MediaTek MT7663e firmware (client mode offload) endef +define KernelPackage/mt7663-usb-sdio + $(KernelPackage/mt76-default) + TITLE:=MediaTek MT7663 USB/SDIO shared code + DEPENDS+=+kmod-mt7615-common + HIDDEN:=1 + FILES:= \ + $(PKG_BUILD_DIR)/mt7615/mt7663-usb-sdio-common.ko +endef + +define KernelPackage/mt7663s + $(KernelPackage/mt76-default) + TITLE:=MediaTek MT7663s wireless driver + DEPENDS+=+kmod-mmc +kmod-mt7615-common +kmod-mt7663-usb-sdio + FILES:= \ + $(PKG_BUILD_DIR)/mt76-sdio.ko \ + $(PKG_BUILD_DIR)/mt7615/mt7663s.ko + AUTOLOAD:=$(call AutoProbe,mt7663s) +endef + define KernelPackage/mt7663u $(KernelPackage/mt76-default) TITLE:=MediaTek MT7663u wireless driver - DEPENDS+=+kmod-mt76-usb +kmod-mt7615-common + DEPENDS+=+kmod-mt76-usb +kmod-mt7615-common +kmod-mt7663-usb-sdio FILES:= $(PKG_BUILD_DIR)/mt7615/mt7663u.ko AUTOLOAD:=$(call AutoProbe,mt7663u) endef @@ -186,6 +210,15 @@ define KernelPackage/mt7915e AUTOLOAD:=$(call AutoProbe,mt7915e) endef +define Package/mt76-test + SECTION:=devel + CATEGORY:=Development + TITLE:=mt76 testmode CLI + DEPENDS:=kmod-mt76-core +libnl-tiny +endef + +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny + NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR) \ -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ @@ -199,6 +232,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH endif +ifdef CONFIG_PACKAGE_CFG80211_TESTMODE + NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE + PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y +endif + ifdef CONFIG_PACKAGE_kmod-mt76-usb PKG_MAKE_FLAGS += CONFIG_MT76_USB=m endif @@ -239,6 +277,13 @@ ifdef CONFIG_PACKAGE_kmod-mt7615e NOSTDINC_FLAGS += -DCONFIG_MT7622_WMAC endif endif +ifdef CONFIG_PACKAGE_kmod-mt7663-usb-sdio + PKG_MAKE_FLAGS += CONFIG_MT7663_USB_SDIO_COMMON=m +endif +ifdef CONFIG_PACKAGE_kmod-mt7663s + PKG_MAKE_FLAGS += CONFIG_MT76_SDIO=m + PKG_MAKE_FLAGS += CONFIG_MT7663S=m +endif ifdef CONFIG_PACKAGE_kmod-mt7663u PKG_MAKE_FLAGS += CONFIG_MT7663U=m endif @@ -253,6 +298,11 @@ define Build/Compile M="$(PKG_BUILD_DIR)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ modules + $(MAKE) -C $(PKG_BUILD_DIR)/tools +endef + +define Build/Install + : endef define Package/kmod-mt76/install @@ -334,6 +384,11 @@ define KernelPackage/mt7915e/install $(1)/lib/firmware/mediatek endef +define Package/mt76-test/install + mkdir -p $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin +endef + $(eval $(call KernelPackage,mt76-core)) $(eval $(call KernelPackage,mt76-usb)) $(eval $(call KernelPackage,mt76x02-usb)) @@ -350,6 +405,9 @@ $(eval $(call KernelPackage,mt7615-firmware)) $(eval $(call KernelPackage,mt7615e)) $(eval $(call KernelPackage,mt7663-firmware-ap)) $(eval $(call KernelPackage,mt7663-firmware-sta)) +$(eval $(call KernelPackage,mt7663-usb-sdio)) $(eval $(call KernelPackage,mt7663u)) +$(eval $(call KernelPackage,mt7663s)) $(eval $(call KernelPackage,mt7915e)) $(eval $(call KernelPackage,mt76)) +$(eval $(call BuildPackage,mt76-test)) From 60f595daab45f1ffab2f422ba493a09b41e51ef4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 5 Aug 2020 19:57:43 +0200 Subject: [PATCH 13/45] binutils: update to version 2.34 Fixes perf on aarch64 Signed-off-by: Felix Fietkau --- package/devel/binutils/Makefile | 25 +- ...-compiler-sanitization-flags-on-to-l.patch | 65 - ...rget-binaries-ensure-that-the-warnin.patch | 1258 ----------------- 3 files changed, 19 insertions(+), 1329 deletions(-) delete mode 100644 package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch delete mode 100644 package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index e04611f5d3..6ad326efa0 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils -PKG_VERSION:=2.27 +PKG_VERSION:=2.34 PKG_RELEASE:=1 PKG_SOURCE_URL:=@GNU/binutils -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_VERSION:=$(PKG_VERSION) -PKG_HASH:=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 +PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 PKG_FIXUP:=autoreconf PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl @@ -37,10 +37,17 @@ define Package/libbfd DEPENDS:=+zlib $(ICONV_DEPENDS) $(INTL_DEPENDS) endef +define Package/libctf + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libctf + DEPENDS:=+libbfd +endef + define Package/libopcodes SECTION:=libs CATEGORY:=Libraries - TITLE:=libbfd + TITLE:=libopcodes DEPENDS:=+libbfd endef @@ -56,7 +63,7 @@ define Package/objdump SECTION:=devel CATEGORY:=Development TITLE:=objdump - DEPENDS:=+libopcodes + DEPENDS:=+libopcodes +libctf endef define Package/ar @@ -94,7 +101,12 @@ endef define Package/libbfd/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so* $(1)/usr/lib/ +endef + +define Package/libctf/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libctf.so* $(1)/usr/lib/ endef define Package/libopcodes/install @@ -121,6 +133,7 @@ define Package/binutils/install endef $(eval $(call BuildPackage,libbfd)) +$(eval $(call BuildPackage,libctf)) $(eval $(call BuildPackage,libopcodes)) $(eval $(call BuildPackage,binutils)) $(eval $(call BuildPackage,objdump)) diff --git a/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch b/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch deleted file mode 100644 index 823527a2bc..0000000000 --- a/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 183eb37e25d903ccd68cc2d8f8a37e75872c03d2 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Tue, 6 Sep 2016 17:35:35 +0100 -Subject: [PATCH 1/2] Do not pass host compiler sanitization flags on to linker - testsuite. - - * Makefile.am (CFLAGS_FOR_TARGET): Define as a copy of CFLAGS but - without any sanitization options. - (CXXFLAGS_FOR_TARGET): Define as a copy of CXXFLAGS but without - any sanitization options. - (check-DEJAGNU): Pass CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET - as CFLAGS and CXXFLAGS respectively. ---- - ld/Makefile.am | 8 ++++++-- - ld/Makefile.in | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -136,6 +136,10 @@ CXX_FOR_TARGET = ` \ - fi; \ - fi` - -+# Strip out sanitization options as we want to test building binaries without any extra paraphernalia -+CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` -+CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` -+ - transform = s/^ld-new$$/$(installed_linker)/;@program_transform_name@ - bin_PROGRAMS = ld-new - info_TEXINFOS = ld.texinfo -@@ -2075,8 +2079,8 @@ check-DEJAGNU: site.exp - runtest=$(RUNTEST); \ - if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ -- CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \ -- CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ -+ CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS_FOR_TARGET)" \ -+ CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ - OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \ ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -507,6 +507,10 @@ CXX_FOR_TARGET = ` \ - fi; \ - fi` - -+ -+# Strip out sanitization options as they require special host libraries. -+CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` -+CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` - info_TEXINFOS = ld.texinfo - ld_TEXINFOS = configdoc.texi - noinst_TEXINFOS = ldint.texinfo -@@ -3644,8 +3648,8 @@ check-DEJAGNU: site.exp - runtest=$(RUNTEST); \ - if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ -- CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \ -- CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ -+ CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS_FOR_TARGET)" \ -+ CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ - OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \ diff --git a/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch b/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch deleted file mode 100644 index b87c58ec77..0000000000 --- a/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch +++ /dev/null @@ -1,1258 +0,0 @@ -From b8ff24c72174effd5c5527866313982e28507275 Mon Sep 17 00:00:00 2001 -From: Vlad Zakharov -Date: Mon, 26 Sep 2016 16:36:08 +0100 -Subject: [PATCH 2/2] When building target binaries, ensure that the warning - flags selected for the command line match the target compiler. - -bfd * warning.m4 (AC_EGREP_CPP_FOR_BUILD): Introduce macro - to verify CC_FOR_BUILD compiler. - (AM_BINUTILS_WARNINGS): Introduce ac_cpp_for_build variable - and add CC_FOR_BUILD compiler checks. - * Makefile.in: Regenerate. - * configure: Likewise. - * doc/Makefile.in: Likewise. - -binutils * Makefile.am: Replace AM_CLFAGS with AM_CFLAGS_FOR_BUILD - when building with CC_FOR_BUILD compiler. - * Makefile.in: Regenerate. - * configure: Likewise. - * doc/Makefile.in: Likewise. - -gas * Makefile.in: Regenerate. - * configure: Likewise. - * doc/Makefile.in: Likewise. - -gold * Makefile.in: Regenerate. - * configure: Likewise. - * testsuite/Makefile.in: Likewise. - -gprof * Makefile.in: Regenerate. - * configure: Likewise. - -ld * Makefile.in: Regenerate. - * configure: Likewise. - -opcodes * Makefile.in: Regenerate. - * configure: Likewise. ---- - bfd/Makefile.in | 1 + - bfd/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - bfd/doc/Makefile.in | 1 + - bfd/warning.m4 | 47 ++++++++++++++++++++++++++++++++++---- - binutils/Makefile.am | 10 +++++---- - binutils/Makefile.in | 10 +++++---- - binutils/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - binutils/doc/Makefile.in | 1 + - gas/Makefile.in | 1 + - gas/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - gas/doc/Makefile.in | 1 + - gold/Makefile.in | 5 +++-- - gold/configure | 52 ++++++++++++++++++++++++++++++++++++++---- - gold/testsuite/Makefile.in | 1 + - gprof/Makefile.in | 1 + - gprof/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - ld/Makefile.in | 3 ++- - ld/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - opcodes/Makefile.in | 1 + - opcodes/configure | 56 +++++++++++++++++++++++++++++++++++++++++----- - 20 files changed, 416 insertions(+), 55 deletions(-) - ---- a/bfd/Makefile.in -+++ b/bfd/Makefile.in -@@ -288,6 +288,7 @@ TDEFINES = @TDEFINES@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - abs_builddir = @abs_builddir@ ---- a/bfd/configure -+++ b/bfd/configure -@@ -659,6 +659,7 @@ MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - REPORT_BUGS_TEXI - REPORT_BUGS_TO -@@ -11427,7 +11428,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11430 "configure" -+#line 11431 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11533,7 +11534,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11536 "configure" -+#line 11537 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12240,8 +12241,12 @@ fi - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12286,6 +12291,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -12301,6 +12336,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -12314,25 +12350,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -12343,6 +12386,7 @@ fi - - - -+ - - - ---- a/bfd/doc/Makefile.in -+++ b/bfd/doc/Makefile.in -@@ -248,6 +248,7 @@ TDEFINES = @TDEFINES@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - abs_builddir = @abs_builddir@ ---- a/bfd/warning.m4 -+++ b/bfd/warning.m4 -@@ -17,12 +17,34 @@ dnl along with this program; see the fil - dnl . - dnl - -+# AC_EGREP_CPP_FOR_BUILD(PATTERN, PROGRAM, -+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# ------------------------------------------------------ -+AC_DEFUN([AC_EGREP_CPP_FOR_BUILD], -+[AC_LANG_PREPROC_REQUIRE()dnl -+AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) -+AS_IF([dnl eval is necessary to expand ac_cpp. -+dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. -+(eval "$ac_cpp_for_build conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | -+dnl Quote $1 to prevent m4 from eating character classes -+ $EGREP "[$1]" >/dev/null 2>&1], -+ [$3], -+ [$4]) -+rm -f conftest* -+])# AC_EGREP_CPP_FOR_BUILD -+ -+ - AC_DEFUN([AM_BINUTILS_WARNINGS],[ - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - AC_EGREP_CPP([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow") -@@ -34,6 +56,14 @@ AC_EGREP_CPP([^[0-4]$],[__GNUC__],,GCC_W - WARN_WRITE_STRINGS="" - AC_EGREP_CPP([^[0-3]$],[__GNUC__],,WARN_WRITE_STRINGS="-Wwrite-strings") - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+AC_EGREP_CPP_FOR_BUILD([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow") -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+AC_EGREP_CPP_FOR_BUILD([^[0-4]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144") -+ - AC_ARG_ENABLE(werror, - [ --enable-werror treat compile warnings as errors], - [case "${enableval}" in -@@ -47,6 +77,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -60,25 +91,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - AC_ARG_ENABLE(build-warnings, - [ --enable-build-warnings enable build-time compiler warnings], - [case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac]) - - if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then -@@ -86,6 +124,7 @@ if test x"$silent" != x"yes" && test x"$ - fi - - AC_SUBST(WARN_CFLAGS) -+AC_SUBST(WARN_CFLAGS_FOR_BUILD) - AC_SUBST(NO_WERROR) - AC_SUBST(WARN_WRITE_STRINGS) - ]) ---- a/binutils/Makefile.am -+++ b/binutils/Makefile.am -@@ -47,8 +47,10 @@ ZLIB = @zlibdir@ -lz - ZLIBINC = @zlibinc@ - - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - NO_WERROR = @NO_WERROR@ - AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) -+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC) - LIBICONV = @LIBICONV@ - - # these two are almost the same program -@@ -305,17 +307,17 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJ - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ - - syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h -- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c -+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c - - sysinfo.@OBJEXT@: sysinfo.c - if [ -r sysinfo.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ - fi - - bin2c$(EXEEXT_FOR_BUILD): bin2c.c -- $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c -+ $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c - - embedspu: embedspu.sh Makefile - awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@ ---- a/binutils/Makefile.in -+++ b/binutils/Makefile.in -@@ -401,6 +401,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi` -@@ -478,6 +479,7 @@ am__skipyacc = - ZLIB = @zlibdir@ -lz - ZLIBINC = @zlibinc@ - AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) -+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC) - - # these two are almost the same program - AR_PROG = ar -@@ -1370,17 +1372,17 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJ - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ - - syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h -- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c -+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c - - sysinfo.@OBJEXT@: sysinfo.c - if [ -r sysinfo.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ - fi - - bin2c$(EXEEXT_FOR_BUILD): bin2c.c -- $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c -+ $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c - - embedspu: embedspu.sh Makefile - awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@ ---- a/binutils/configure -+++ b/binutils/configure -@@ -652,6 +652,7 @@ YFLAGS - YACC - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - OTOOL64 - OTOOL -@@ -11225,7 +11226,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11228 "configure" -+#line 11229 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11331,7 +11332,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11334 "configure" -+#line 11335 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11945,8 +11946,12 @@ _ACEOF - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -11991,6 +11996,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -12006,6 +12041,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -12019,25 +12055,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -12048,6 +12091,7 @@ fi - - - -+ - - - ---- a/binutils/doc/Makefile.in -+++ b/binutils/doc/Makefile.in -@@ -249,6 +249,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - YACC = @YACC@ ---- a/gas/Makefile.in -+++ b/gas/Makefile.in -@@ -255,6 +255,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ @WARN_WRITE_STRINGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` ---- a/gas/configure -+++ b/gas/configure -@@ -642,6 +642,7 @@ cgen_cpu_prefix - GDBINIT - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - OTOOL64 - OTOOL -@@ -10985,7 +10986,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10988 "configure" -+#line 10989 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11091,7 +11092,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11094 "configure" -+#line 11095 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11721,8 +11722,12 @@ using_cgen=no - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -11767,6 +11772,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -11782,6 +11817,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -11795,25 +11831,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -11824,6 +11867,7 @@ fi - - - -+ - - - ---- a/gas/doc/Makefile.in -+++ b/gas/doc/Makefile.in -@@ -230,6 +230,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - YACC = @YACC@ ---- a/gold/Makefile.in -+++ b/gold/Makefile.in -@@ -87,8 +87,8 @@ subdir = . - DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.in \ -- $(srcdir)/../mkinstalldirs $(top_srcdir)/po/Make-in \ -- ftruncate.c pread.c mremap.c ffsll.c yyscript.h yyscript.c \ -+ $(srcdir)/../mkinstalldirs $(top_srcdir)/po/Make-in ffsll.c \ -+ mremap.c ftruncate.c pread.c yyscript.h yyscript.c \ - $(srcdir)/../depcomp $(srcdir)/../ylwrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ -@@ -409,6 +409,7 @@ TARGETOBJS = @TARGETOBJS@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_CXXFLAGS = @WARN_CXXFLAGS@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ ---- a/gold/configure -+++ b/gold/configure -@@ -609,6 +609,7 @@ GOLD_LDFLAGS - WARN_CXXFLAGS - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - IFUNC_STATIC_FALSE - IFUNC_STATIC_TRUE -@@ -6723,8 +6724,12 @@ fi - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -6769,6 +6774,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -6784,6 +6819,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -6797,25 +6833,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -6826,6 +6869,7 @@ fi - - - -+ - - - ---- a/gold/testsuite/Makefile.in -+++ b/gold/testsuite/Makefile.in -@@ -2568,6 +2568,7 @@ TARGETOBJS = @TARGETOBJS@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_CXXFLAGS = @WARN_CXXFLAGS@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ ---- a/gprof/Makefile.in -+++ b/gprof/Makefile.in -@@ -267,6 +267,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - abs_builddir = @abs_builddir@ ---- a/gprof/configure -+++ b/gprof/configure -@@ -604,6 +604,7 @@ LTLIBOBJS - LIBOBJS - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - GENINSRC_NEVER_FALSE - GENINSRC_NEVER_TRUE -@@ -10901,7 +10902,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10904 "configure" -+#line 10905 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11007,7 +11008,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11010 "configure" -+#line 11011 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12101,8 +12102,12 @@ fi - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12147,6 +12152,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -12162,6 +12197,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -12175,25 +12211,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -12204,6 +12247,7 @@ fi - - - -+ - - - ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -354,6 +354,7 @@ TESTBFDLIB = @TESTBFDLIB@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi` -@@ -508,7 +509,7 @@ CXX_FOR_TARGET = ` \ - fi` - - --# Strip out sanitization options as they require special host libraries. -+# Strip out sanitization options as we want to test building binaries without any extra paraphernalia - CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` - CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'` - info_TEXINFOS = ld.texinfo ---- a/ld/configure -+++ b/ld/configure -@@ -646,6 +646,7 @@ LIBINTL - USE_NLS - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - installed_linker - install_as_default -@@ -11723,7 +11724,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11726 "configure" -+#line 11727 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11829,7 +11830,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11832 "configure" -+#line 11833 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15558,8 +15559,12 @@ fi - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15604,6 +15609,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -15619,6 +15654,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -15632,25 +15668,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -15661,6 +15704,7 @@ fi - - - -+ - - - ---- a/opcodes/Makefile.in -+++ b/opcodes/Makefile.in -@@ -267,6 +267,7 @@ STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ -+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@ - WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@ - XGETTEXT = @XGETTEXT@ - abs_builddir = @abs_builddir@ ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -643,6 +643,7 @@ MAINTAINER_MODE_TRUE - NO_WMISSING_FIELD_INITIALIZERS - WARN_WRITE_STRINGS - NO_WERROR -+WARN_CFLAGS_FOR_BUILD - WARN_CFLAGS - OTOOL64 - OTOOL -@@ -11150,7 +11151,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11153 "configure" -+#line 11154 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11256,7 +11257,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11259 "configure" -+#line 11260 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11508,8 +11509,12 @@ fi - # Set the 'development' global. - . $srcdir/../bfd/development.sh - -+# Set acp_cpp_for_build variable -+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD" -+ - # Default set of GCC warnings to enable. - GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" -+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" - - # Add -Wshadow if the compiler is a sufficiently recent version of GCC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -11554,6 +11559,36 @@ fi - rm -f conftest* - - -+# Verify CC_FOR_BUILD to be compatible with waring flags -+ -+# Add -Wshadow if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-3]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow" -+fi -+rm -f conftest* -+ -+ -+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+__GNUC__ -+_ACEOF -+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 | -+ $EGREP "^[0-4]$" >/dev/null 2>&1; then : -+ -+else -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144" -+fi -+rm -f conftest* -+ -+ - # Check whether --enable-werror was given. - if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; case "${enableval}" in -@@ -11569,6 +11604,7 @@ case "${host}" in - *-*-mingw32*) - if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format" - fi - ;; - *) ;; -@@ -11582,25 +11618,32 @@ fi - NO_WERROR= - if test "${ERROR_ON_WARNING}" = yes ; then - GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" -+ GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror" - NO_WERROR="-Wno-error" - fi - - if test "${GCC}" = yes ; then - WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}" - fi - - # Check whether --enable-build-warnings was given. - if test "${enable_build_warnings+set}" = set; then : - enableval=$enable_build_warnings; case "${enableval}" in -- yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}";; -+ yes) WARN_CFLAGS="${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";; - no) if test "${GCC}" = yes ; then - WARN_CFLAGS="-w" -+ WARN_CFLAGS_FOR_BUILD="-w" - fi;; - ,*) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";; -+ WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}" -+ WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";; - *,) t=`echo "${enableval}" | sed -e "s/,/ /g"` -- WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";; -- *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+ WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}" -+ WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";; -+ *) WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"` -+ WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac - fi - -@@ -11611,6 +11654,7 @@ fi - - - -+ - - - ac_ext=c From b7727a8005635a46255518bdf19eb016e160278a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 25 Jul 2020 10:49:21 +0200 Subject: [PATCH 14/45] mac80211: fix AQL issues - Remove bogus STA txq pending airtime underflow warning - Improve tx airtime estimation for A-MPDU traffic Signed-off-by: Felix Fietkau --- ...11-improve-AQL-tx-airtime-estimation.patch | 81 +++++++++++++++++++ ...STA-txq-pending-airtime-underflow-wa.patch | 31 +++++++ 2 files changed, 112 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch create mode 100644 package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch diff --git a/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch new file mode 100644 index 0000000000..f344281439 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch @@ -0,0 +1,81 @@ +From: Felix Fietkau +Date: Fri, 24 Jul 2020 20:25:07 +0200 +Subject: [PATCH] mac80211: improve AQL tx airtime estimation + +AQL does not take into account that most HT/VHT/HE traffic is A-MPDU aggregated. +Because of that, the per-packet airtime overhead is vastly overestimated. +Improve it by assuming an average aggregation length of 16 for non-legacy +traffic if not using the VO AC queue. +This should improve performance with high data rates, especially with multiple +stations + +Signed-off-by: Felix Fietkau +--- + +--- a/net/mac80211/airtime.c ++++ b/net/mac80211/airtime.c +@@ -551,7 +551,7 @@ EXPORT_SYMBOL_GPL(ieee80211_calc_tx_airt + u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *pubsta, +- int len) ++ int len, bool ampdu) + { + struct ieee80211_supported_band *sband; + struct ieee80211_chanctx_conf *conf; +@@ -572,10 +572,26 @@ u32 ieee80211_calc_expected_tx_airtime(s + if (pubsta) { + struct sta_info *sta = container_of(pubsta, struct sta_info, + sta); ++ struct ieee80211_tx_rate *rate = &sta->tx_stats.last_rate; ++ u32 airtime; + +- return ieee80211_calc_tx_airtime_rate(hw, +- &sta->tx_stats.last_rate, +- band, len); ++ if (!(rate->flags & (IEEE80211_TX_RC_VHT_MCS | ++ IEEE80211_TX_RC_MCS))) ++ ampdu = false; ++ ++ /* ++ * Assume that HT/VHT transmission on any AC except VO will ++ * use aggregation. Since we don't have reliable reporting ++ * of aggregation length, assume an average of 16. ++ * This will not be very accurate, but much better than simply ++ * assuming un-aggregated tx. ++ */ ++ airtime = ieee80211_calc_tx_airtime_rate(hw, rate, band, ++ ampdu ? len * 16 : len); ++ if (ampdu) ++ airtime /= 16; ++ ++ return airtime; + } + + if (!conf) +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -2278,7 +2278,7 @@ extern const struct ethtool_ops ieee8021 + u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *pubsta, +- int len); ++ int len, bool ampdu); + #ifdef CPTCFG_MAC80211_NOINLINE + #define debug_noinline noinline + #else +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3694,10 +3694,11 @@ encap_out: + + if (vif && + wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) { ++ bool ampdu = txq->ac != IEEE80211_AC_VO; + u32 airtime; + + airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, +- skb->len); ++ skb->len, ampdu); + if (airtime) { + airtime = ieee80211_info_set_tx_time_est(info, airtime); + ieee80211_sta_update_pending_airtime(local, tx.sta, diff --git a/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch b/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch new file mode 100644 index 0000000000..ab3a77e19b --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch @@ -0,0 +1,31 @@ +From: Felix Fietkau +Date: Sat, 25 Jul 2020 10:42:30 +0200 +Subject: [PATCH] mac80211: remove STA txq pending airtime underflow + warning + +This warning can trigger if there is a mismatch between frames that were +sent with the sta pointer set vs tx status frames reported for the sta address. + +This can happen due to race conditions on re-creating stations, or even +in the case of .sta_add/remove being used instead of .sta_state, which can cause +frames to be sent to a station that has not been uploaded yet. + +If there is an actual underflow issue, it should show up in the device airtime +warning below, so it is better to remove this one. + +Signed-off-by: Felix Fietkau +--- + +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -1924,9 +1924,7 @@ void ieee80211_sta_update_pending_airtim + if (sta) { + tx_pending = atomic_sub_return(tx_airtime, + &sta->airtime[ac].aql_tx_pending); +- if (WARN_ONCE(tx_pending < 0, +- "STA %pM AC %d txq pending airtime underflow: %u, %u", +- sta->addr, ac, tx_pending, tx_airtime)) ++ if (tx_pending < 0) + atomic_cmpxchg(&sta->airtime[ac].aql_tx_pending, + tx_pending, 0); + } From 431b177afa79340136745536f472a58aa869a438 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 20 Jul 2020 18:18:50 +0200 Subject: [PATCH 15/45] mediatek: fix mt7622-rfb1 board support Make GPIO keys active-low. Add DSA support Signed-off-by: Felix Fietkau --- .../mt7622/base-files/etc/board.d/02_network | 3 + .../patches-5.4/0005-dts-mt7622-add-gsw.patch | 110 +++++++++--------- .../0308-dts-mt7622-add-snand-support.patch | 4 +- ...dts-add-wmac-support-for-mt7622-rfb1.patch | 4 +- ...ngs-PCI-Mediatek-Update-PCIe-binding.patch | 6 +- ...ek-Split-PCIe-node-for-MT2712-MT7622.patch | 2 +- 6 files changed, 68 insertions(+), 61 deletions(-) diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network index eed01a9293..426d9937bf 100755 --- a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network @@ -13,6 +13,9 @@ mediatek_setup_interfaces() bananapi,bpi-r64) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" wan ;; + mediatek,mt7622-rfb1) + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan + ;; *) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6u@eth0" "5u@eth1" diff --git a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch index 872854fd8c..906b661538 100644 --- a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch +++ b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch @@ -63,17 +63,15 @@ * * SPDX-License-Identifier: (GPL-2.0 OR MIT) */ -@@ -14,8 +13,8 @@ +@@ -14,7 +13,7 @@ #include "mt6380.dtsi" / { - model = "MediaTek MT7622 RFB1 board"; -- compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622"; + model = "MT7622_MT7531 RFB"; -+ compatible = "bananapi,bpi-r64", "mediatek,mt7622"; + compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622"; aliases { - serial0 = &uart0; @@ -23,7 +22,7 @@ chosen { @@ -83,7 +81,7 @@ }; cpus { -@@ -40,23 +39,45 @@ +@@ -40,23 +39,38 @@ gpio-keys { compatible = "gpio-keys"; @@ -93,24 +91,17 @@ label = "factory"; linux,code = ; - gpios = <&pio 0 0>; -+ gpios = <&pio 0 GPIO_ACTIVE_HIGH>; ++ gpios = <&pio 0 GPIO_ACTIVE_LOW>; }; wps { label = "wps"; linux,code = ; - gpios = <&pio 102 0>; -+ gpios = <&pio 102 GPIO_ACTIVE_HIGH>; ++ gpios = <&pio 102 GPIO_ACTIVE_LOW>; + }; + }; + -+ gsw: gsw@0 { -+ compatible = "mediatek,mt753x"; -+ mediatek,ethsys = <ðsys>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -133,7 +124,7 @@ }; reg_1p8v: regulator-1p8v { -@@ -101,27 +122,67 @@ +@@ -101,23 +115,82 @@ }; ð { @@ -169,48 +160,61 @@ + mdio: mdio-bus { #address-cells = <1>; #size-cells = <0>; -- + - phy5: ethernet-phy@5 { - reg = <5>; - phy-mode = "sgmii"; -- }; ++ switch@0 { ++ compatible = "mediatek,mt7531"; ++ reg = <0>; ++ reset-gpios = <&pio 54 0>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ label = "lan1"; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ label = "lan2"; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ label = "lan3"; ++ }; ++ ++ port@3 { ++ reg = <3>; ++ label = "lan4"; ++ }; ++ ++ port@4 { ++ reg = <4>; ++ label = "wan"; ++ }; ++ ++ port@6 { ++ reg = <6>; ++ label = "cpu"; ++ ethernet = <&gmac0>; ++ phy-mode = "2500base-x"; ++ ++ fixed-link { ++ speed = <2500>; ++ full-duplex; ++ pause; ++ }; ++ }; ++ }; + }; }; }; - -+&gsw { -+ mediatek,mdio = <&mdio>; -+ mediatek,portmap = "llllw"; -+ mediatek,mdio_master_pinmux = <0>; -+ reset-gpios = <&pio 54 0>; -+ interrupt-parent = <&pio>; -+ interrupts = <53 IRQ_TYPE_LEVEL_HIGH>; -+ status = "okay"; -+ -+ port5: port@5 { -+ compatible = "mediatek,mt753x-port"; -+ reg = <5>; -+ phy-mode = "rgmii"; -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; -+ -+ port6: port@6 { -+ compatible = "mediatek,mt753x-port"; -+ reg = <6>; -+ phy-mode = "sgmii"; -+ fixed-link { -+ speed = <2500>; -+ full-duplex; -+ }; -+ }; -+}; -+ - &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; -@@ -185,15 +246,28 @@ +@@ -185,15 +258,28 @@ &pcie { pinctrl-names = "default"; @@ -240,7 +244,7 @@ /* eMMC is shared pin with parallel NAND */ emmc_pins_default: emmc-pins-default { mux { -@@ -460,11 +534,11 @@ +@@ -460,11 +546,11 @@ }; &sata { diff --git a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch index 4e10319508..378ccb8338 100644 --- a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch +++ b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch @@ -22,7 +22,7 @@ "mediatek,mt8173-nor"; --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts -@@ -108,7 +108,7 @@ +@@ -101,7 +101,7 @@ }; &bch { @@ -31,7 +31,7 @@ }; &btif { -@@ -541,6 +541,62 @@ +@@ -553,6 +553,62 @@ status = "disable"; }; diff --git a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch index 3ebe45c6e4..b545ea809d 100644 --- a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch +++ b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch @@ -20,7 +20,7 @@ "syscon"; --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts -@@ -579,7 +579,7 @@ +@@ -591,7 +591,7 @@ reg = <0x140000 0x0080000>; }; @@ -29,7 +29,7 @@ label = "Factory"; reg = <0x1c0000 0x0040000>; }; -@@ -636,3 +636,8 @@ +@@ -648,3 +648,8 @@ pinctrl-0 = <&watchdog_pins>; status = "okay"; }; diff --git a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch index 02e4c130ea..e32042301f 100644 --- a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch +++ b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch @@ -382,7 +382,8 @@ Signed-off-by: chuanjia.liu }; }; + }; -+ + +- pcie1: pcie@1,0 { + pcie1: pcie@1a145000 { + compatible = "mediatek,mt7622-pcie"; + device_type = "pci"; @@ -407,8 +408,7 @@ Signed-off-by: chuanjia.liu + bus-range = <0x00 0xff>; + ranges = <0x82000000 0 0x28000000 0 0x28000000 0 0x8000000>; + status = "disabled"; - -- pcie1: pcie@1,0 { ++ + slot1: pcie@1,0 { reg = <0x0800 0 0 0 0>; #address-cells = <3>; diff --git a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch index 48713ecc64..bc0f7b1a6c 100644 --- a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch +++ b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch @@ -389,7 +389,7 @@ Signed-off-by: chuanjia.liu <0 0 0 2 &pcie_intc1 1>, --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts -@@ -244,18 +244,16 @@ +@@ -256,18 +256,16 @@ }; }; From 3d731fc9030655e18d86f81ca8aed3341ab2bc1e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 26 Jul 2020 15:12:32 +0200 Subject: [PATCH 16/45] mac80211: merge performance improvement patches Fix fq_codel performance issues Add a new rx function for batch processing Signed-off-by: Felix Fietkau --- ...unction-for-running-rx-without-passi.patch | 186 ++++++++++++++++++ ...skb_get_hash-instead-of-skb_get_hash.patch | 55 ++++++ ...lcate-skb-hash-early-when-using-itxq.patch | 19 ++ 3 files changed, 260 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch create mode 100644 package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch create mode 100644 package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch diff --git a/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch b/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch new file mode 100644 index 0000000000..5837a7b651 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch @@ -0,0 +1,186 @@ +From: Felix Fietkau +Date: Sat, 25 Jul 2020 20:53:23 +0200 +Subject: [PATCH] mac80211: add a function for running rx without passing skbs + to the stack + +This can be used to run mac80211 rx processing on a batch of frames in NAPI +poll before passing them to the network stack in a large batch. +This can improve icache footprint, or it can be used to pass frames via +netif_receive_skb_list. + +Signed-off-by: Felix Fietkau +--- + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -4358,6 +4358,31 @@ void ieee80211_free_hw(struct ieee80211_ + void ieee80211_restart_hw(struct ieee80211_hw *hw); + + /** ++ * ieee80211_rx_list - receive frame and store processed skbs in a list ++ * ++ * Use this function to hand received frames to mac80211. The receive ++ * buffer in @skb must start with an IEEE 802.11 header. In case of a ++ * paged @skb is used, the driver is recommended to put the ieee80211 ++ * header of the frame on the linear part of the @skb to avoid memory ++ * allocation and/or memcpy by the stack. ++ * ++ * This function may not be called in IRQ context. Calls to this function ++ * for a single hardware must be synchronized against each other. Calls to ++ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be ++ * mixed for a single hardware. Must not run concurrently with ++ * ieee80211_tx_status() or ieee80211_tx_status_ni(). ++ * ++ * This function must be called with BHs disabled and RCU read lock ++ * ++ * @hw: the hardware this frame came in on ++ * @sta: the station the frame was received from, or %NULL ++ * @skb: the buffer to receive, owned by mac80211 after this call ++ * @list: the destination list ++ */ ++void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *sta, ++ struct sk_buff *skb, struct list_head *list); ++ ++/** + * ieee80211_rx_napi - receive frame from NAPI context + * + * Use this function to hand received frames to mac80211. The receive +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -218,7 +218,7 @@ enum ieee80211_rx_flags { + }; + + struct ieee80211_rx_data { +- struct napi_struct *napi; ++ struct list_head *list; + struct sk_buff *skb; + struct ieee80211_local *local; + struct ieee80211_sub_if_data *sdata; +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2552,8 +2552,8 @@ static void ieee80211_deliver_skb_to_loc + memset(skb->cb, 0, sizeof(skb->cb)); + + /* deliver to local stack */ +- if (rx->napi) +- napi_gro_receive(rx->napi, skb); ++ if (rx->list) ++ list_add_tail(&skb->list, rx->list); + else + netif_receive_skb(skb); + } +@@ -3843,7 +3843,6 @@ void ieee80211_release_reorder_timeout(s + /* This is OK -- must be QoS data frame */ + .security_idx = tid, + .seqno_idx = tid, +- .napi = NULL, /* must be NULL to not have races */ + }; + struct tid_ampdu_rx *tid_agg_rx; + +@@ -4453,8 +4452,8 @@ static bool ieee80211_invoke_fast_rx(str + /* deliver to local stack */ + skb->protocol = eth_type_trans(skb, fast_rx->dev); + memset(skb->cb, 0, sizeof(skb->cb)); +- if (rx->napi) +- napi_gro_receive(rx->napi, skb); ++ if (rx->list) ++ list_add_tail(&skb->list, rx->list); + else + netif_receive_skb(skb); + +@@ -4521,7 +4520,7 @@ static bool ieee80211_prepare_and_rx_han + static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, + struct ieee80211_sta *pubsta, + struct sk_buff *skb, +- struct napi_struct *napi) ++ struct list_head *list) + { + struct ieee80211_local *local = hw_to_local(hw); + struct ieee80211_sub_if_data *sdata; +@@ -4536,7 +4535,7 @@ static void __ieee80211_rx_handle_packet + memset(&rx, 0, sizeof(rx)); + rx.skb = skb; + rx.local = local; +- rx.napi = napi; ++ rx.list = list; + + if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc)) + I802_DEBUG_INC(local->dot11ReceivedFragmentCount); +@@ -4644,8 +4643,8 @@ static void __ieee80211_rx_handle_packet + * This is the receive path handler. It is called by a low level driver when an + * 802.11 MPDU is received from the hardware. + */ +-void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, +- struct sk_buff *skb, struct napi_struct *napi) ++void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, ++ struct sk_buff *skb, struct list_head *list) + { + struct ieee80211_local *local = hw_to_local(hw); + struct ieee80211_rate *rate = NULL; +@@ -4737,36 +4736,53 @@ void ieee80211_rx_napi(struct ieee80211_ + status->rx_flags = 0; + + /* +- * key references and virtual interfaces are protected using RCU +- * and this requires that we are in a read-side RCU section during +- * receive processing +- */ +- rcu_read_lock(); +- +- /* + * Frames with failed FCS/PLCP checksum are not returned, + * all other frames are returned without radiotap header + * if it was previously present. + * Also, frames with less than 16 bytes are dropped. + */ + skb = ieee80211_rx_monitor(local, skb, rate); +- if (!skb) { +- rcu_read_unlock(); ++ if (!skb) + return; +- } + + ieee80211_tpt_led_trig_rx(local, + ((struct ieee80211_hdr *)skb->data)->frame_control, + skb->len); + +- __ieee80211_rx_handle_packet(hw, pubsta, skb, napi); +- +- rcu_read_unlock(); ++ __ieee80211_rx_handle_packet(hw, pubsta, skb, list); + + return; + drop: + kfree_skb(skb); + } ++EXPORT_SYMBOL(ieee80211_rx_list); ++ ++void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, ++ struct sk_buff *skb, struct napi_struct *napi) ++{ ++ struct sk_buff *tmp; ++ LIST_HEAD(list); ++ ++ ++ /* ++ * key references and virtual interfaces are protected using RCU ++ * and this requires that we are in a read-side RCU section during ++ * receive processing ++ */ ++ rcu_read_lock(); ++ ieee80211_rx_list(hw, pubsta, skb, &list); ++ rcu_read_unlock(); ++ ++ if (!napi) { ++ netif_receive_skb_list(&list); ++ return; ++ } ++ ++ list_for_each_entry_safe(skb, tmp, &list, list) { ++ skb_list_del_init(skb); ++ napi_gro_receive(napi, skb); ++ } ++} + EXPORT_SYMBOL(ieee80211_rx_napi); + + /* This is a version of the rx handler that can be called from hard irq diff --git a/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch b/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch new file mode 100644 index 0000000000..77ecc82302 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch @@ -0,0 +1,55 @@ +From: Felix Fietkau +Date: Sun, 26 Jul 2020 14:37:02 +0200 +Subject: [PATCH] net/fq_impl: use skb_get_hash instead of + skb_get_hash_perturb + +This avoids unnecessary regenerating of the skb flow hash + +Signed-off-by: Felix Fietkau +--- + +--- a/include/net/fq.h ++++ b/include/net/fq.h +@@ -69,15 +69,6 @@ struct fq { + struct list_head backlogs; + spinlock_t lock; + u32 flows_cnt; +-#if LINUX_VERSION_IS_GEQ(5,3,10) || \ +- LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \ +- LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \ +- LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \ +- LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0) +- siphash_key_t perturbation; +-#else +- u32 perturbation; +-#endif + u32 limit; + u32 memory_limit; + u32 memory_usage; +--- a/include/net/fq_impl.h ++++ b/include/net/fq_impl.h +@@ -108,15 +108,7 @@ begin: + + static u32 fq_flow_idx(struct fq *fq, struct sk_buff *skb) + { +-#if LINUX_VERSION_IS_GEQ(5,3,10) || \ +- LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \ +- LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \ +- LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \ +- LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0) +- u32 hash = skb_get_hash_perturb(skb, &fq->perturbation); +-#else +- u32 hash = skb_get_hash_perturb(skb, fq->perturbation); +-#endif ++ u32 hash = skb_get_hash(skb); + + return reciprocal_scale(hash, fq->flows_cnt); + } +@@ -316,7 +308,6 @@ static int fq_init(struct fq *fq, int fl + INIT_LIST_HEAD(&fq->backlogs); + spin_lock_init(&fq->lock); + fq->flows_cnt = max_t(u32, flows_cnt, 1); +- get_random_bytes(&fq->perturbation, sizeof(fq->perturbation)); + fq->quantum = 300; + fq->limit = 8192; + fq->memory_limit = 16 << 20; /* 16 MBytes */ diff --git a/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch b/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch new file mode 100644 index 0000000000..92b136279a --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch @@ -0,0 +1,19 @@ +From: Felix Fietkau +Date: Sun, 26 Jul 2020 14:42:58 +0200 +Subject: [PATCH] mac80211: calculcate skb hash early when using itxq + +This avoids flow separation issues when using software encryption + +Signed-off-by: Felix Fietkau +--- + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3937,6 +3937,7 @@ void __ieee80211_subif_start_xmit(struct + if (local->ops->wake_tx_queue) { + u16 queue = __ieee80211_select_queue(sdata, sta, skb); + skb_set_queue_mapping(skb, queue); ++ skb_get_hash(skb); + } + + if (sta) { From d1db1f4240c43d87ca898b885d1009120d0cc22d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 6 Aug 2020 12:49:02 +0200 Subject: [PATCH 17/45] ipq40xx: refresh kernel 5.4 config Refresh config with make kernel_oldconfig. After d1a8217d87bf ("kernel: clean-up build-configurable kernel config symbols"), the routine wants to add an additional CONFIG_CGROUPS (=n), which has been removed manually again, as this seems unintended. Signed-off-by: Adrian Schmutzler --- target/linux/ipq40xx/config-5.4 | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4 index 6cbd9f9500..671f2b41f5 100644 --- a/target/linux/ipq40xx/config-5.4 +++ b/target/linux/ipq40xx/config-5.4 @@ -58,14 +58,11 @@ CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y -# CONFIG_ARM_LPAE is not set CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set # CONFIG_ARM_SMMU is not set -# CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_AT803X_PHY=y @@ -88,8 +85,6 @@ CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y -# CONFIG_CPU_BIG_ENDIAN is not set -# CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_CACHE_V7=y CONFIG_CPU_CACHE_VIPT=y CONFIG_CPU_COPY_V6=y @@ -107,8 +102,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_HAS_ASID=y -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y @@ -170,7 +163,6 @@ CONFIG_CRYPTO_ZSTD=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DEBUG_MISC=y -# CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -270,6 +262,8 @@ CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_OPTEE=y +CONFIG_HZ=100 +CONFIG_HZ_100=y CONFIG_HZ_FIXED=0 CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y @@ -473,6 +467,7 @@ CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_CLASS=y CONFIG_RTC_I2C_AND_SPI=y +CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_SPIN_ON_OWNER=y # CONFIG_SDM_CAMCC_845 is not set # CONFIG_SDM_DISPCC_845 is not set @@ -482,7 +477,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y # CONFIG_SDM_LPASSCC_845 is not set # CONFIG_SDM_VIDEOCC_845 is not set CONFIG_SERIAL_8250_FSL=y -# CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y @@ -512,7 +506,6 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_OF=y -# CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y @@ -526,7 +519,6 @@ CONFIG_UBIFS_FS_ZSTD=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y -# CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y CONFIG_USB_COMMON=y CONFIG_USB_SUPPORT=y From 6c29604438a0c2cbf95930244319c41d57756d7d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 6 Aug 2020 12:53:14 +0200 Subject: [PATCH 18/45] build: set up host command for egrep It is used for the kernel build and uses GNU specific features Signed-off-by: Felix Fietkau --- include/prereq-build.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 83dad0f2dc..4637c6ca50 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -114,6 +114,10 @@ $(eval $(call SetupHostCommand,grep,Please install GNU 'grep', \ ggrep --version 2>&1 | grep GNU, \ grep --version 2>&1 | grep GNU)) +$(eval $(call SetupHostCommand,egrep,Please install GNU 'grep', \ + gegrep --version 2>&1 | grep GNU, \ + egrep --version 2>&1 | grep GNU)) + $(eval $(call SetupHostCommand,getopt, \ Please install an extended getopt version that supports --long, \ gnugetopt -o t --long test -- --test | grep '^ *--test *--', \ From d0b229f553a814b22c16976e40a197f892c0c0df Mon Sep 17 00:00:00 2001 From: Tobias Welz Date: Tue, 4 Aug 2020 17:55:40 +0200 Subject: [PATCH 19/45] ramips: correct WizFi630S pin mappings WizFi630S had some pins changed in the release version of the board. The run led, wps button and a slide switch where affected. This patch is correcting this. i2c is removed as it is sharing a pin with the run (system) led. uart2 is enabled as it is also enabled in the OEM firmware. Signed-off-by: Tobias Welz --- .../ramips/dts/mt7628an_wiznet_wizfi630s.dts | 34 +++++-------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 41634c6002..684a70cffe 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -28,7 +28,7 @@ led_run: run { label = "wizfi630s:green:run"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; ledwps { @@ -61,47 +61,29 @@ wps { label = "wps"; - gpios = <&gpio 32 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; }; scm1 { label = "SCM1"; - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; linux,code = ; + linux,input-type = ; }; scm2 { label = "SCM2"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,code = ; + linux,input-type = ; }; }; }; &state_default { gpio { - groups = "gpio"; - function = "gpio"; - }; - - i2s { - groups = "i2s"; - function = "gpio"; - }; - - wdt { - groups = "wdt"; - function = "gpio"; - }; - - i2c { - groups = "i2c"; - function = "gpio"; - }; - - refclk { - groups = "refclk"; + groups = "gpio", "i2s", "i2c", "wdt", "refclk", "p1led_an", "p2led_an"; function = "gpio"; }; }; @@ -150,11 +132,11 @@ }; }; -&i2c { +&uart1 { status = "okay"; }; -&uart1 { +&uart2 { status = "okay"; }; From 633ea0db0f70c226f272db4727a58f96d3135208 Mon Sep 17 00:00:00 2001 From: Tobias Welz Date: Tue, 4 Aug 2020 18:30:15 +0200 Subject: [PATCH 20/45] ramips: WizFi630S use macs from factory partion WIZnet WizFi630s has three mac addresses in the factory partition: 0x04 (also on the label), 0x28 for wan mac and 0x2e as lan mac. All three macadresses are sequential series of addresses. This is making use of them. While at it, also add the label MAC address to 02_network. MAC addresses as verified by OEM firmware: use interface source WLAN ra0 factory 0x04 (label) WAN eth0.2 factory 0x28 (label + 1) LAN eth0.1 factory 0x2e (label + 2) Signed-off-by: Tobias Welz [fix sorting in 02_network, commit message adjustments] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 2 +- .../linux/ramips/mt76x8/base-files/etc/board.d/02_network | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 684a70cffe..3bb1e06eb1 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -145,7 +145,7 @@ }; ðernet { - mtd-mac-address = <&factory 0x28>; + mtd-mac-address = <&factory 0x2e>; }; &esw { diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 83437ea364..3920afde95 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -199,8 +199,7 @@ ramips_setup_macs() ;; rakwireless,rak633|\ unielec,u7628-01-16m|\ - wavlink,wl-wn575a3|\ - wiznet,wizfi630s) + wavlink,wl-wn575a3) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x28)" 1) ;; tplink,archer-c20-v4|\ @@ -225,6 +224,10 @@ ramips_setup_macs() zbtlink,zbt-we1226) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x2e)" 1) ;; + wiznet,wizfi630s) + label_mac=$(mtd_get_mac_binary factory 0x4) + wan_mac=$(mtd_get_mac_binary factory 0x28) + ;; xiaomi,mir4a-100m) wan_mac=$(mtd_get_mac_binary factory 0x4) ;; From 77e850fe76e3585a0d5094dbb8ea11be7d150aa8 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 6 Aug 2020 13:26:19 +0200 Subject: [PATCH 21/45] ramips: tidy up MAC address setup for Linkit Smart and Omega2 Linkit Smart 7688 and Onion Omega 2(+) are one-port devices, and have their port set to LAN by default. Setting up a WAN MAC address for them doesn't make any sense, as no wan interface will be created in uci config. Despite, these devices also set lan_mac in 02_network, although mtd-mac-address sets a different address for the ethernet interface in DTS. Clean this up by moving the lan_mac value into DTS and dropping the entries in 02_network completely. That way, the effective address on the LAN interface should stay the same, but we get rid of the extra (re)assignments. As I don't have access to the devices, this does not tell anything about whether 0x2e is actually a good choice, it just preserves the existing assignment. Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts | 2 +- target/linux/ramips/dts/mt7628an_onion_omega2.dtsi | 2 +- .../linux/ramips/mt76x8/base-files/etc/board.d/02_network | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index b3bd0aeae2..1042defb3f 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -149,7 +149,7 @@ }; ðernet { - mtd-mac-address = <&factory 0x28>; + mtd-mac-address = <&factory 0x2e>; }; &sdhci { diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 1757d06763..04187a8353 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -151,7 +151,7 @@ }; ðernet { - mtd-mac-address = <&factory 0x28>; + mtd-mac-address = <&factory 0x2e>; }; &sdhci { diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 3920afde95..5a5ba587d5 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -188,12 +188,6 @@ ramips_setup_macs() totolink,lr1200) wan_mac=$(mtd_get_mac_binary factory 0x2e) ;; - mediatek,linkit-smart-7688|\ - onion,omega2|\ - onion,omega2p) - wan_mac=$(mtd_get_mac_binary factory 0x4) - lan_mac=$(mtd_get_mac_binary factory 0x2e) - ;; mercury,mac1200r-v2) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1) ;; From 392a6bb5781f84f7785b569102760770a0b5bfd2 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 6 Aug 2020 13:41:00 +0200 Subject: [PATCH 22/45] glibc: update to latest 2.31 commit [BZ #19519 BZ #26332 BZ #26248] 6fdf971c9d Add NEWS entry for CVE-2016-10228 (bug 19519) 70d585151c Rewrite iconv option parsing [BZ #19519] 1c8efe848b powerpc: Fix incorrect cache line size load in memset (bug 26332) 7611339a9b nptl: Zero-extend arguments to SETXID syscalls [BZ #26248] 21b760cc2f Disable warnings due to deprecated libselinux symbols used by nss and nscd Signed-off-by: Hans Dedecker --- toolchain/glibc/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 9a9c4a5343..6b3f15b129 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6f3459f9859a7b506c64fa1823769ab631072c6e -PKG_MIRROR_HASH:=01ed0c8131bdc32c9abd3aaaebc4fcffb2d496c2b8c363a0e845ac09d874a2ff +PKG_SOURCE_VERSION:=6fdf971c9dbf7dac9bea552113fe4694015bbc4d +PKG_MIRROR_HASH:=80998023c237bd0eaa38554e18536d8f66223e97fc5ade015a2d2aadf587d1f0 PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz From 2d9b653a2f157a36e56677a466bac09968560a71 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Aug 2020 15:14:46 +0100 Subject: [PATCH 23/45] libubox: update to git HEAD 9e52171 blobmsg: introduce BLOBMSG_CAST_INT64 Signed-off-by: Daniel Golle --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 025f6489e7..9d41ed7c7a 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=cb941cd33f43b38ef1a1f2b4fd212e0bb21c100dcdd2ab1976f8cc2071566d32 -PKG_SOURCE_DATE:=2020-07-11 -PKG_SOURCE_VERSION:=f4e9bf73ac5c0ee6b8f240e2a2100e70ca56d705 +PKG_MIRROR_HASH:=cf963b19f5a25da85b2d8888514cbcc33c3f641c4478c9c25312b8bf83fe9e6b +PKG_SOURCE_DATE:=2020-08-06 +PKG_SOURCE_VERSION:=9e52171d70def760a6949676800d0b73f85ee22d CMAKE_INSTALL:=1 PKG_LICENSE:=ISC From e0e607f0d000e62c6af8d822d7c3f57c2a582136 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Aug 2020 15:24:41 +0100 Subject: [PATCH 24/45] procd: update to git HEAD 47a9f0d service: add method to query available container features afbaba9 initd: attempt to mount cgroup2 ead60fe jail: use pidns semantics also for timens 759e9f8 jail: make use of BLOBMSG_CAST_INT64 for OCI rlimits 83053b6 instance: add instances into unified cgroup hierarchy 16159bb jail: parse OCI cgroups resources Signed-off-by: Daniel Golle --- package/kernel/linux/modules/block.mk | 14 ++++++++++++++ package/system/procd/Makefile | 6 +++--- target/linux/x86/config-5.4 | 18 ++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index fbd3c81911..8a7232d8be 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -565,3 +565,17 @@ define KernelPackage/scsi-tape endef $(eval $(call KernelPackage,scsi-tape)) + +define KernelPackage/iosched-bfq + SUBMENU:=$(BLOCK_MENU) + TITLE:=Kernel support for BFQ I/O scheduler + KCONFIG:= \ + CONFIG_IOSCHED_BFQ \ + CONFIG_BFQ_GROUP_IOSCHED=y \ + CONFIG_BFQ_CGROUP_DEBUG=n + FILES:= \ + $(LINUX_DIR)/block/bfq.ko + AUTOLOAD:=$(call AutoLoad,10,bfq) +endef + +$(eval $(call KernelPackage,iosched-bfq)) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 4373149ff9..6e9433b7c3 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-07-30 -PKG_SOURCE_VERSION:=2ae5cbcf1d4509837a16eceafca374e9bf0ea850 -PKG_MIRROR_HASH:=479d4a4bfb71ef54300e7b669846e596db7792566302b4d29e3265643d89bce3 +PKG_SOURCE_DATE:=2020-08-06 +PKG_SOURCE_VERSION:=16159bb1f70f662738395f2750a7a5e74a410408 +PKG_MIRROR_HASH:=52189cf7ded713524e5afb94132665e2558be24c7c64fda89be4341bbe3af8c4 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index dbd23ce0f4..7755bf4cba 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -56,17 +56,13 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ATA=y CONFIG_ATA_GENERIC=y CONFIG_ATA_PIIX=y -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOUNCE=y -CONFIG_CC_CAN_LINK=y -CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_SANE_STACKPROTECTOR=y -CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_CLKBLD_I8253=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKEVT_I8253=y @@ -92,8 +88,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_CPU_SUP_CYRIX_32=y @@ -145,9 +141,7 @@ CONFIG_EFI_EARLYCON=y # CONFIG_EISA is not set # CONFIG_EUROTECH_WDT is not set CONFIG_EXT4_FS=y -# CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y -# CONFIG_F2FS_FS_SECURITY is not set CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y # CONFIG_F71808E_WDT is not set @@ -191,9 +185,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_VDSO_32=y # CONFIG_GEOS is not set CONFIG_GLOB=y -# CONFIG_HABANA_AI is not set -# CONFIG_HANGCHECK_TIMER is not set # CONFIG_HALTPOLL_CPUIDLE is not set +# CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y @@ -279,10 +272,8 @@ CONFIG_I8253_LOCK=y # CONFIG_IBMASR is not set # CONFIG_IBM_RTL is not set # CONFIG_IE6XX_WDT is not set -# CONFIG_IGC is not set CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_INITRAMFS_SOURCE="" -CONFIG_INIT_STACK_NONE=y CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y @@ -332,7 +323,6 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_MIGRATION=y -# CONFIG_MISC_ALCOR_PCI is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set @@ -388,7 +378,6 @@ CONFIG_PCI_GOANY=y CONFIG_PCI_IOV=y CONFIG_PCI_LABEL=y CONFIG_PCI_LOCKLESS_CONFIG=y -# CONFIG_PCI_MESON is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCSPKR_PLATFORM=y @@ -418,7 +407,6 @@ CONFIG_RTC_MC146818_LIB=y # CONFIG_SC1200_WDT is not set CONFIG_SCSI=y # CONFIG_SCSI_FDOMAIN_ISA is not set -# CONFIG_SCSI_MYRS is not set CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y @@ -444,7 +432,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y -# CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TOSHIBA is not set # CONFIG_TQMX86_WDT is not set CONFIG_UNWINDER_FRAME_POINTER=y @@ -452,7 +439,6 @@ CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_UP_LATE_INIT=y CONFIG_USB=y CONFIG_USB_COMMON=y -# CONFIG_USB_EHCI_FSL is not set CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_PCI=y From 3b89849b57a88d0919b6442509131f045af580a8 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 3 Aug 2020 19:23:50 +0200 Subject: [PATCH 25/45] ramips: add common definition netgear_sercomm_nor Like NAND-based devices, SPI-NOR based Netgear devices also share a common setup for their images. This creates a common defition for them in image/Makefile, so it can be reused across subtargets. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/Makefile | 14 +++++++++++++- target/linux/ramips/image/mt7621.mk | 16 +++++----------- target/linux/ramips/image/mt76x8.mk | 21 ++++++--------------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index d72d937ab8..c0890e6bb3 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -12,7 +12,7 @@ DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK DEVICE_VARS += SERCOMM_HWNAME SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER -DEVICE_VARS += JCG_MAXSIZE +DEVICE_VARS += SERCOMM_PAD JCG_MAXSIZE loadaddr-y := 0x80000000 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000 @@ -176,6 +176,18 @@ define Device/Default IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size endef +define Device/netgear_sercomm_nor + BLOCKSIZE := 64k + DEVICE_VENDOR := NETGEAR + IMAGES += factory.img + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size + IMAGE/factory.img := pad-extra $$$$(SERCOMM_PAD) | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + zip $$$$(SERCOMM_HWNAME).bin | sercom-seal +endef + define Device/seama SEAMA_MTDBLOCK := 2 IMAGES += factory.bin diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index f13be3d3bc..d296e389a4 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -827,22 +827,16 @@ endef TARGET_DEVICES += netgear_wac124 define Device/netgear_wndr3700-v5 + $(Device/netgear_sercomm_nor) $(Device/uimage-lzma-loader) - BLOCKSIZE := 64k IMAGE_SIZE := 15232k + DEVICE_MODEL := WNDR3700 + DEVICE_VARIANT := v5 + SERCOMM_HWNAME := WNDR3700v5 SERCOMM_HWID := AYB SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x1054 - IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ - pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size - IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip WNDR3700v5.bin | \ - sercom-seal - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := WNDR3700 - DEVICE_VARIANT := v5 + SERCOMM_PAD := 320k DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += wndr3700v5 diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 669077c1d3..908e2df529 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -216,20 +216,8 @@ define Device/mercury_mac1200r-v2 endef TARGET_DEVICES += mercury_mac1200r-v2 -define Device/netgear_r6xxx - BLOCKSIZE := 64k - DEVICE_VENDOR := NETGEAR - IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ - pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size - IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ - zip $$$$(SERCOMM_HWNAME).bin | sercom-seal -endef - define Device/netgear_r6020 - $(Device/netgear_r6xxx) + $(Device/netgear_sercomm_nor) IMAGE_SIZE := 7104k DEVICE_MODEL := R6020 DEVICE_PACKAGES := kmod-mt76x2 @@ -237,11 +225,12 @@ define Device/netgear_r6020 SERCOMM_HWID := CFR SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 + SERCOMM_PAD := 576k endef TARGET_DEVICES += netgear_r6020 define Device/netgear_r6080 - $(Device/netgear_r6xxx) + $(Device/netgear_sercomm_nor) IMAGE_SIZE := 7552k DEVICE_MODEL := R6080 DEVICE_PACKAGES := kmod-mt76x2 @@ -249,11 +238,12 @@ define Device/netgear_r6080 SERCOMM_HWID := CFR SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 + SERCOMM_PAD := 576k endef TARGET_DEVICES += netgear_r6080 define Device/netgear_r6120 - $(Device/netgear_r6xxx) + $(Device/netgear_sercomm_nor) IMAGE_SIZE := 15744k DEVICE_MODEL := R6120 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci @@ -261,6 +251,7 @@ define Device/netgear_r6120 SERCOMM_HWID := CGQ SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 + SERCOMM_PAD := 576k endef TARGET_DEVICES += netgear_r6120 From a66449c60893a168fa0c13a29127d29314b2e348 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 3 Aug 2020 23:53:21 +0200 Subject: [PATCH 26/45] ramips: drop remaining m25p,chunked-io from DTS This option was a spi nor hack which is dropped in commit bcf4a5f474d1 ("ramips: remove chunked-io patch and set spi->max_transfer_size instead") Most of it has already been removed in be2b61e4f1ec ("ramips: drop m25p,chunked-io from dts") It seems all current usages were added after that. Remove them. Cc: Chuanhong Guo Reported-by: Sungbo Eo Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi | 1 - target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts | 1 - target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 1 - 3 files changed, 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi index 61c5d7b7c4..9bd1da4443 100644 --- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi +++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi @@ -62,7 +62,6 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; - m25p,chunked-io = <32>; partitions { compatible = "fixed-partitions"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index b33c2ecae8..9731008aea 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -65,7 +65,6 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>; - m25p,chunked-io = <32>; partitions { compatible = "fixed-partitions"; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 3bb1e06eb1..91661bb2b0 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -98,7 +98,6 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; - m25p,chunked-io = <31>; partitions { compatible = "fixed-partitions"; From a673ac66fa52693410c2d97c9ad6ec9d628d6d8a Mon Sep 17 00:00:00 2001 From: Shibajee Roy Date: Sun, 2 Aug 2020 21:19:52 +0600 Subject: [PATCH 27/45] ramips: add support for Netgear JWNR2010 v5 Specification: - CPU: MediaTek MT7620N (580 MHz) - Flash size: 4 MB NOR SPI - RAM size: 32 MB DDR1 - Bootloader: U-Boot - Wireless: MT7620N 2x2 MIMO 802.11b/g/n (2.4 GHz) - Switch: MT7620 built-in 10/100 switch with vlan support - Ports: 4x LAN, 1x WAN - Others: 7x LED, Reset button, UART header on PCB (57600 8N1) Flash instructions: 1. Use ethernet cable to connect router with PC/Laptop, any router LAN port will work. 2. To flash openwrt we are using nmrpflash[1]. 3. Flash commands: First we need to identify the correct Ethernet id. nmrpflash -L nmrpflash -i net* -f openwrt-ramips-mt7620-netgear_jwnr2010-v5-squashfs-factory.img This will show something like "Advertising NMRP server on net*..." (net*, *=1,2,3... etc.) 4. Now remove the power cable from router back side and immediately connect it again. You will see flash notification in CMD window, once it says reboot the device just plug off the router and plug in again. Revert to stock: 1. Download the stock firmware from official netgear support[2]. 2. Follow the same nmrpflash procedure like above, this time just use the stock firmware. nmrpflash -i net* -f N300-V1.1.0.54_1.0.1.img MAC addresses on stock firmware: LAN = *:28 (label) WAN = *:29 WLAN = *:28 On flash, the only valid MAC address is found in factory 0x4. Special Note: This openwrt firmware will also support other netgear N300 routers like below as they share same stock firmware[3]. JNR1010v2 / WNR614 / WNR618 / JWNR2000v5 / WNR2020 / WNR1000v4 / WNR2020v2 / WNR2050 [1] https://github.com/jclehner/nmrpflash [2] https://www.netgear.com/support/product/JWNR2010v5.aspx [3] http://kb.netgear.com/000059663 Signed-off-by: Shibajee Roy [create DTSI, use netgear_sercomm_nor, disable by default, add MAC addresses to commit message, add label MAC address] Signed-off-by: Adrian Schmutzler --- .../dts/mt7620n_netgear_jwnr2010-v5.dts | 57 +++++++++++++ .../ramips/dts/mt7620n_netgear_n300.dtsi | 83 +++++++++++++++++++ target/linux/ramips/image/mt7620.mk | 16 ++++ .../mt7620/base-files/etc/board.d/01_leds | 7 ++ .../mt7620/base-files/etc/board.d/02_network | 2 + 5 files changed, 165 insertions(+) create mode 100644 target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts create mode 100644 target/linux/ramips/dts/mt7620n_netgear_n300.dtsi diff --git a/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts new file mode 100644 index 0000000000..fb84c00203 --- /dev/null +++ b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7620n_netgear_n300.dtsi" + +/ { + compatible = "netgear,jwnr2010-v5", "ralink,mt7620n-soc"; + model = "Netgear JWNR2010 v5"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = ðernet; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "jwnr2010-v5:green:power"; + gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "jwnr2010-v5:green:wan"; + gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>; + }; + + wlan { + label = "jwnr2010-v5:green:wlan"; + gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + + lan1 { + label = "jwnr2010-v5:green:lan1"; + gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + }; + + lan2 { + label = "jwnr2010-v5:green:lan2"; + gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + }; + + lan3 { + label = "jwnr2010-v5:green:lan3"; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + }; + + lan4 { + label = "jwnr2010-v5:green:lan4"; + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi b/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi new file mode 100644 index 0000000000..6f5be57ec7 --- /dev/null +++ b/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7620n.dtsi" + +#include +#include + +/ { + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&gpio2 { + status = "okay"; +}; + +&gpio3 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <30000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x20000 0x3c0000>; + }; + + partition@3e0000 { + label = "nvram"; + reg = <0x3e0000 0x10000>; + read-only; + }; + + factory: partition@3f0000 { + label = "factory"; + reg = <0x3f0000 0x10000>; + read-only; + }; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; + + mediatek,portmap = "llllw"; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0x0>; +}; + +&state_default { + default { + groups = "pa", "ephy", "wled"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 34e2e42c33..7ebab8d757 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -696,6 +696,22 @@ define Device/netgear_ex6130 endef TARGET_DEVICES += netgear_ex6130 +define Device/netgear_jwnr2010-v5 + $(Device/netgear_sercomm_nor) + SOC := mt7620n + BLOCKSIZE := 4k + IMAGE_SIZE := 3840k + DEVICE_MODEL := JWNR2010 + DEVICE_VARIANT := v5 + SERCOMM_HWNAME := N300 + SERCOMM_HWID := ASW + SERCOMM_HWVER := A001 + SERCOMM_SWVER := 0x0040 + SERCOMM_PAD := 128k + DEFAULT := n +endef +TARGET_DEVICES += netgear_jwnr2010-v5 + define Device/netgear_wn3000rp-v3 SOC := mt7620a IMAGE_SIZE := 7872k diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index 2b2ac6b46b..90d1596783 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -165,6 +165,13 @@ netgear,ex6130) ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0" ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1" ;; +netgear,jwnr2010-v5) + ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x08" + ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x04" + ucidef_set_led_switch "lan3" "lan3" "$boardname:green:lan3" "switch0" "0x02" + ucidef_set_led_switch "lan4" "lan4" "$boardname:green:lan4" "switch0" "0x01" + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ;; phicomm,psg1208) set_wifi_led "$boardname:white:wlan2g" ;; diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index f85b7cfed1..bcf122c427 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -108,6 +108,7 @@ ramips_setup_interfaces() "0:lan" "6@eth0" ;; dlink,dir-810l|\ + netgear,jwnr2010-v5|\ trendnet,tew-810dr|\ zbtlink,zbt-we2026) ucidef_add_switch "switch0" \ @@ -240,6 +241,7 @@ ramips_setup_macs() edimax,ew-7478apc|\ fon,fon2601|\ head-weblink,hdrm200|\ + netgear,jwnr2010-v5|\ nexx,wt3020-4m|\ nexx,wt3020-8m|\ phicomm,psg1208|\ From 394f54ee6201542cf0a69d307b13ffda233dd87a Mon Sep 17 00:00:00 2001 From: Davy Hollevoet Date: Mon, 22 Jun 2020 14:45:14 +0200 Subject: [PATCH 28/45] ath79/nand: add support for Netgear WNDR4300TN This patch adds support for the WNDR4300TN, marketed by Belgian ISP Telenet. The hardware is the same as the WNDR4300 v1, without the fifth ethernet port (WAN) and the USB port. The circuit board has the traces, but the components are missing. Specifications: * SoC: Atheros AR9344 * RAM: 128 MB * Flash: 128 MB NAND flash * WiFi: Atheros AR9580 (5 GHz) and AR9344 (2.4 GHz) * Ethernet: 4x 1000Base-T * LED: Power, LAN, WiFi 2.4GHz, WiFi 5GHz, WPS * UART: on board, to the right of the RF shield at the top of the board Installation: * Flashing through the OEM web interface: + Connect your computer to the router with an ethernet cable and browse to http://192.168.0.51/ + Log in with the default credentials are admin:password + Browse to Advanced > Administration > Firmware Upgrade in the Telenet interface + Upload the Openwrt firmware: openwrt-ath79-nand-netgear_wndr4300tn-squashfs-factory.img + Proceed with the firmware installation and give the device a few minutes to finish and reboot. * Flashing through TFTP: + Configure your wired client with a static IP in the 192.168.1.x range, e.g. 192.168.1.10 and netmask 255.255.255.0. + Power off the router. + Press and hold the RESET button (the factory reset button on the bottom of the device, with the gray circle around it, next to the Telenet logo) and turn the router on while keeping the button pressed. + The power LED will start flashing orange. You can release the button once it switches to flashing green. + Transfer the image over TFTP: $ tftp 192.168.1.1 -m binary -c put openwrt-ath79-nand-netgear_wndr4300tn-squashfs-factory.img Signed-off-by: Davy Hollevoet [use DT label reference for adding LEDs in DTSI files] Signed-off-by: Adrian Schmutzler --- package/boot/uboot-envtools/files/ath79 | 1 + .../linux/ath79/dts/ar9344_netgear_wndr.dtsi | 41 +------------------ .../ath79/dts/ar9344_netgear_wndr3700-v4.dts | 2 + .../ath79/dts/ar9344_netgear_wndr4300.dts | 2 + .../ath79/dts/ar9344_netgear_wndr4300sw.dts | 2 + .../ath79/dts/ar9344_netgear_wndr4300tn.dts | 9 ++++ .../ath79/dts/ar9344_netgear_wndr_usb.dtsi | 34 +++++++++++++++ .../ath79/dts/ar9344_netgear_wndr_wan.dtsi | 13 ++++++ target/linux/ath79/image/nand.mk | 10 +++++ .../nand/base-files/etc/board.d/02_network | 4 ++ .../etc/hotplug.d/firmware/10-ath9k-eeprom | 2 + 11 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts create mode 100644 target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi create mode 100644 target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 0442e9e485..aca8a089c3 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -64,6 +64,7 @@ netgear,wndrmac-v1) ;; netgear,wndr3700-v4|\ netgear,wndr4300|\ +netgear,wndr4300tn|\ netgear,wndr4300sw) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" ;; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index 90978fb99f..f2909061da 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -40,7 +40,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -57,16 +57,6 @@ default-state = "keep"; }; - wan_green { - label = "netgear:green:wan"; - gpios = <&gpio 1 GPIO_ACTIVE_LOW>; - }; - - wan_amber { - label = "netgear:amber:wan"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - wlan2g_green { label = "netgear:green:wlan2g"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -88,13 +78,6 @@ label = "netgear:amber:wps"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; - - usb_green { - label = "netgear:green:usb"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - trigger-sources = <&hub_port>; - linux,default-trigger = "usbport"; - }; }; ubi-concat { @@ -272,28 +255,6 @@ qca,no-eeprom; #gpio-cells = <2>; gpio-controller; - - usb_power { - gpio-hog; - line-name = "netgear:power:usb"; - gpios = <0 GPIO_ACTIVE_HIGH>; - output-high; - }; - }; -}; - -&usb_phy { - status = "okay"; -}; - -&usb { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - hub_port: port@1 { - reg = <1>; - #trigger-source-cells = <0>; }; }; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts b/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts index 8a38aeab59..a7756f1d44 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts +++ b/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts @@ -2,6 +2,8 @@ /dts-v1/; #include "ar9344_netgear_wndr.dtsi" +#include "ar9344_netgear_wndr_wan.dtsi" +#include "ar9344_netgear_wndr_usb.dtsi" / { compatible = "netgear,wndr3700-v4", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts index 9b57bb88a6..235181d8d4 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts +++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts @@ -2,6 +2,8 @@ /dts-v1/; #include "ar9344_netgear_wndr.dtsi" +#include "ar9344_netgear_wndr_wan.dtsi" +#include "ar9344_netgear_wndr_usb.dtsi" / { compatible = "netgear,wndr4300", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts index fb90eee550..7643b3c140 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts +++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts @@ -2,6 +2,8 @@ /dts-v1/; #include "ar9344_netgear_wndr.dtsi" +#include "ar9344_netgear_wndr_wan.dtsi" +#include "ar9344_netgear_wndr_usb.dtsi" / { compatible = "netgear,wndr4300sw", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts new file mode 100644 index 0000000000..bed85a3877 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9344_netgear_wndr.dtsi" + +/ { + compatible = "netgear,wndr4300tn", "qca,ar9344"; + model = "Netgear WNDR4300TN"; +}; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi new file mode 100644 index 0000000000..e3780632e9 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +&leds { + usb_green { + label = "netgear:green:usb"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + trigger-sources = <&hub_port>; + linux,default-trigger = "usbport"; + }; +}; + +&ath9k { + usb_power { + gpio-hog; + line-name = "netgear:power:usb"; + gpios = <0 GPIO_ACTIVE_HIGH>; + output-high; + }; +}; + +&usb_phy { + status = "okay"; +}; + +&usb { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + hub_port: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi new file mode 100644 index 0000000000..91c2971f8c --- /dev/null +++ b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +&leds { + wan_green { + label = "netgear:green:wan"; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + + wan_amber { + label = "netgear:amber:wan"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; +}; diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 2efe85d17f..c7f96eb6d4 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -206,6 +206,16 @@ define Device/netgear_wndr4300sw endef TARGET_DEVICES += netgear_wndr4300sw +define Device/netgear_wndr4300tn + SOC := ar9344 + DEVICE_MODEL := WNDR4300TN + NETGEAR_KERNEL_MAGIC := 0x33373033 + NETGEAR_BOARD_ID := WNDR4300TN + NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3 + $(Device/netgear_ath79_nand) +endef +TARGET_DEVICES += netgear_wndr4300tn + define Device/netgear_wndr4300-v2 SOC := qca9563 DEVICE_MODEL := WNDR4300 diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network index daba0e9679..910df517aa 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/02_network +++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network @@ -29,6 +29,10 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; + netgear,wndr4300tn) + ucidef_add_switch "switch0" \ + "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" + ;; zyxel,nbg6716) ucidef_add_switch "switch0" \ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1" diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 60defa5f8b..cac955905a 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -15,6 +15,7 @@ case "$FIRMWARE" in netgear,wndr3700-v4|\ netgear,wndr4300|\ netgear,wndr4300sw|\ + netgear,wndr4300tn|\ netgear,wndr4300-v2|\ netgear,wndr4500-v3) caldata_extract "caldata" 0x1000 0x440 @@ -29,6 +30,7 @@ case "$FIRMWARE" in netgear,wndr3700-v4|\ netgear,wndr4300|\ netgear,wndr4300sw|\ + netgear,wndr4300tn|\ netgear,wndr4300-v2|\ netgear,wndr4500-v3) caldata_extract "caldata" 0x5000 0x440 From 728a0c68d15ede323b913942f3a6c2e0e8d4780e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Aug 2020 15:57:22 +0100 Subject: [PATCH 29/45] Revert "procd: update to git HEAD" This reverts commit e0e607f0d000e62c6af8d822d7c3f57c2a582136. Signed-off-by: Daniel Golle --- package/kernel/linux/modules/block.mk | 14 -------------- package/system/procd/Makefile | 6 +++--- target/linux/x86/config-5.4 | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 8a7232d8be..fbd3c81911 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -565,17 +565,3 @@ define KernelPackage/scsi-tape endef $(eval $(call KernelPackage,scsi-tape)) - -define KernelPackage/iosched-bfq - SUBMENU:=$(BLOCK_MENU) - TITLE:=Kernel support for BFQ I/O scheduler - KCONFIG:= \ - CONFIG_IOSCHED_BFQ \ - CONFIG_BFQ_GROUP_IOSCHED=y \ - CONFIG_BFQ_CGROUP_DEBUG=n - FILES:= \ - $(LINUX_DIR)/block/bfq.ko - AUTOLOAD:=$(call AutoLoad,10,bfq) -endef - -$(eval $(call KernelPackage,iosched-bfq)) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 6e9433b7c3..4373149ff9 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-08-06 -PKG_SOURCE_VERSION:=16159bb1f70f662738395f2750a7a5e74a410408 -PKG_MIRROR_HASH:=52189cf7ded713524e5afb94132665e2558be24c7c64fda89be4341bbe3af8c4 +PKG_SOURCE_DATE:=2020-07-30 +PKG_SOURCE_VERSION:=2ae5cbcf1d4509837a16eceafca374e9bf0ea850 +PKG_MIRROR_HASH:=479d4a4bfb71ef54300e7b669846e596db7792566302b4d29e3265643d89bce3 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index 7755bf4cba..dbd23ce0f4 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -56,13 +56,17 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ATA=y CONFIG_ATA_GENERIC=y CONFIG_ATA_PIIX=y +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOUNCE=y +CONFIG_CC_CAN_LINK=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_SANE_STACKPROTECTOR=y +CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_CLKBLD_I8253=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKEVT_I8253=y @@ -88,8 +92,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set CONFIG_CPU_IDLE_GOV_LADDER=y +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_CPU_SUP_CYRIX_32=y @@ -141,7 +145,9 @@ CONFIG_EFI_EARLYCON=y # CONFIG_EISA is not set # CONFIG_EUROTECH_WDT is not set CONFIG_EXT4_FS=y +# CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y +# CONFIG_F2FS_FS_SECURITY is not set CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y # CONFIG_F71808E_WDT is not set @@ -185,8 +191,9 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_VDSO_32=y # CONFIG_GEOS is not set CONFIG_GLOB=y -# CONFIG_HALTPOLL_CPUIDLE is not set +# CONFIG_HABANA_AI is not set # CONFIG_HANGCHECK_TIMER is not set +# CONFIG_HALTPOLL_CPUIDLE is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y @@ -272,8 +279,10 @@ CONFIG_I8253_LOCK=y # CONFIG_IBMASR is not set # CONFIG_IBM_RTL is not set # CONFIG_IE6XX_WDT is not set +# CONFIG_IGC is not set CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_INITRAMFS_SOURCE="" +CONFIG_INIT_STACK_NONE=y CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y @@ -323,6 +332,7 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_MIGRATION=y +# CONFIG_MISC_ALCOR_PCI is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set @@ -378,6 +388,7 @@ CONFIG_PCI_GOANY=y CONFIG_PCI_IOV=y CONFIG_PCI_LABEL=y CONFIG_PCI_LOCKLESS_CONFIG=y +# CONFIG_PCI_MESON is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCSPKR_PLATFORM=y @@ -407,6 +418,7 @@ CONFIG_RTC_MC146818_LIB=y # CONFIG_SC1200_WDT is not set CONFIG_SCSI=y # CONFIG_SCSI_FDOMAIN_ISA is not set +# CONFIG_SCSI_MYRS is not set CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y @@ -432,6 +444,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y +# CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TOSHIBA is not set # CONFIG_TQMX86_WDT is not set CONFIG_UNWINDER_FRAME_POINTER=y @@ -439,6 +452,7 @@ CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_UP_LATE_INIT=y CONFIG_USB=y CONFIG_USB_COMMON=y +# CONFIG_USB_EHCI_FSL is not set CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_PCI=y From 48f2596e780fa577e269d68179441d5edb22d68f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Aug 2020 16:16:02 +0100 Subject: [PATCH 30/45] procd: update to git HEAD 47a9f0d service: add method to query available container features afbaba9 initd: attempt to mount cgroup2 ead60fe jail: use pidns semantics also for timens 759e9f8 jail: make use of BLOBMSG_CAST_INT64 for OCI rlimits 83053b6 instance: add instances into unified cgroup hierarchy 16159bb jail: parse OCI cgroups resources 282ff0c jail: only free cgroups if they were allocated ab55357 jail: fix freeing cgroups avl Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 4373149ff9..ba4af81a1a 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-07-30 -PKG_SOURCE_VERSION:=2ae5cbcf1d4509837a16eceafca374e9bf0ea850 -PKG_MIRROR_HASH:=479d4a4bfb71ef54300e7b669846e596db7792566302b4d29e3265643d89bce3 +PKG_SOURCE_DATE:=2020-08-06 +PKG_SOURCE_VERSION:=ab55357dfe5bd0edac0b9556a83e69814df791b1 +PKG_MIRROR_HASH:=38c882e105811bcd10b5ce55f91a16a647ed2ad436aec01cd03fda588b7bfca9 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From f85bc0d77d6106e1dfe96773656ff479ee0aefa1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 6 Aug 2020 19:13:01 +0200 Subject: [PATCH 31/45] Revert "add vfconfig" This reverts commit 34553e8cc9ad4530d3f52c3423e5c52fdacac539. This commit was not meant to go into master. Signed-off-by: Jo-Philipp Wich --- package/network/config/vfconfig/Makefile | 40 --- .../config/vfconfig/files/vfconfig.hotplug | 7 - .../config/vfconfig/files/vfconfig.include | 11 - .../network/config/vfconfig/files/vfconfig.sh | 234 ------------------ 4 files changed, 292 deletions(-) delete mode 100644 package/network/config/vfconfig/Makefile delete mode 100644 package/network/config/vfconfig/files/vfconfig.hotplug delete mode 100755 package/network/config/vfconfig/files/vfconfig.include delete mode 100755 package/network/config/vfconfig/files/vfconfig.sh diff --git a/package/network/config/vfconfig/Makefile b/package/network/config/vfconfig/Makefile deleted file mode 100644 index 1fb62d728f..0000000000 --- a/package/network/config/vfconfig/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=vfconfig -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -define Package/vfconfig - SECTION:=net - CATEGORY:=Network - MAINTAINER:=Jo-Philipp Wich - TITLE:=UCI configuration support for VLAN filtering rules - DEPENDS:= +ip-bridge +ip-full - PKGARCH:=all -endef - -define Package/vfconfig/description - This package provides UCI configuration abstraction for VLAN filter rules - on top of Linux bridge interfaces. -endef - -define Build/Compile -endef - -define Build/Configure -endef - -define Package/vfconfig/install - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) ./files/vfconfig.hotplug $(1)/etc/hotplug.d/iface/01-vfconfig - - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_DATA) ./files/vfconfig.include $(1)/lib/network/vfconfig.sh - - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) ./files/vfconfig.sh $(1)/sbin/vfconfig -endef - -$(eval $(call BuildPackage,vfconfig)) diff --git a/package/network/config/vfconfig/files/vfconfig.hotplug b/package/network/config/vfconfig/files/vfconfig.hotplug deleted file mode 100644 index fc2a489dea..0000000000 --- a/package/network/config/vfconfig/files/vfconfig.hotplug +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$ACTION" = ifup ] && [ "$INTERFACE" = loopback ]; then - . /lib/network/dsaconfig.sh - setup_switch -fi - diff --git a/package/network/config/vfconfig/files/vfconfig.include b/package/network/config/vfconfig/files/vfconfig.include deleted file mode 100755 index 4ac11d8061..0000000000 --- a/package/network/config/vfconfig/files/vfconfig.include +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -setup_switch() { - # Skip switch setup on network restart. The netifd process - # will be started afterwards and remove all interfaces again... - if [ "$initscript" = /etc/init.d/network ] && [ "$action" = restart ]; then - return 0 - fi - - /sbin/dsaconfig apply 2>&1 | logger -t dsaconfig -} diff --git a/package/network/config/vfconfig/files/vfconfig.sh b/package/network/config/vfconfig/files/vfconfig.sh deleted file mode 100755 index 5a73c62b27..0000000000 --- a/package/network/config/vfconfig/files/vfconfig.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh -. /lib/functions/network.sh - -bridge_names="" - -warn() { - echo "$@" >&2 -} - -clear_port_vlans() { - local port=$1 - local self=$2 - local vlans=$(bridge vlan show dev "$port" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') - - local vlan - for vlan in $vlans; do - bridge vlan del vid "$vlan" dev "$port" $self - done -} - -add_bridge() { - local cfg=$1 - local brname - - config_get brname "$cfg" bridge "switch0" - - case " $bridge_names " in - *" $brname "*) return 1 ;; - esac - - append bridge_names "$brname" - - export -n "bridge=$brname" -} - -validate_vid() { - local vid=$1 - - case "$vid" in - [1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-4][0-9][0-9][0-9]) - if [ $vid -gt 4096 ]; then - return 1 - fi - ;; - *) - return 1 - ;; - esac - - return 0 -} - -setup_bridge() { - local cfg=$1 - local bridge - - add_bridge "$cfg" || return 0 - - # Prevent netifd from picking up our switch bridge just yet - network_defer_device "$bridge" - - # (Re)create switch bridge device in case it is not yet set up - local filtering=$(cat "/sys/class/net/$bridge/bridge/vlan_filtering" 2>/dev/null) - if [ ${filtering:-0} != 1 ]; then - ip link set "$bridge" down 2>/dev/null - ip link delete dev "$bridge" 2>/dev/null - ip link add name "$bridge" type bridge - echo 1 > "/sys/class/net/$bridge/bridge/vlan_filtering" - fi - - ip link set "$bridge" up - - # Unbridge DSA ports and flush any VLAN filters on them, they're added back later - local port - for port in /sys/class/net/*"/upper_${cfg}"; do - if [ -e "$port" ]; then - port=${port%/upper_*} - port=${port##*/} - - ip link set "$port" nomaster - - # Unbridging the port should already clear VLANs, but be safe - clear_port_vlans "$port" - fi - done - - # Clear any VLANs on the switch bridge, they're added back later - clear_port_vlans "$bridge" self -} - -setup_bridge_vlan() { - local cfg=$1 - local bridge vlan ports - - config_get bridge "$cfg" bridge "switch0" - config_get vlan "$cfg" vlan - config_get ports "$cfg" ports - - validate_vid "$vlan" || { - warn "VLAN section '$cfg' specifies an invalid VLAN ID '$vlan'" - return 1 - } - - # Setup ports - local port tag pvid - for port in $ports; do - tag=untagged - pvid= - - case "$port" in - *"*") - pvid=pvid - port=${port%\*} - ;; - esac - - case "$port" in - *:u) - port=${port%:u} - ;; - *:t) - tag=tagged - port=${port%:t} - ;; - esac - - # Add the port to the switch bridge and delete the default - # VLAN 1 if it is not yet joined to the bridge. - if [ ! -e "/sys/class/net/$port/upper_$bridge" ]; then - ip link set dev "$port" up - ip link set dev "$port" master "$bridge" - - # Get rid of default VLAN 1 - bridge vlan del vid 1 dev "$port" - fi - - # Promote the first untagged VLAN of this port to the PVID - if [ "$tag" = untagged ] && ! bridge vlan show dev "$port" | grep -qi pvid; then - pvid=pvid - fi - - # Add VLAN filter entry for port - bridge vlan add dev "$port" vid $vlan $pvid $tag - done - - # Make the switch bridge itself handle the VLAN as well - bridge vlan add dev "$bridge" self vid $vlan tagged -} - -apply_config() { - config_load network - config_foreach setup_bridge vlan_filter - config_foreach setup_bridge_vlan vlan_filter - - # Ready switch bridge devices - local bridge - for bridge in $bridge_names; do - network_ready_device "$bridge" - done -} - -show_bridge() { - local cfg=$1 - local bridge - - add_bridge "$cfg" || return 0 - - printf "Bridge: %s\n" "$bridge" - printf "VLAN/" - - local port ports - for port in "/sys/class/net/$bridge/lower_"*; do - [ -e "$port" ] || continue - - port=${port##*/lower_} - - printf " | %-5s" "$port" - append ports "$port" - done - - printf " |\nLink:" - - for port in $ports; do - local carrier=$(cat "/sys/class/net/$port/carrier") - local duplex=$(cat "/sys/class/net/$port/duplex") - local speed=$(cat "/sys/class/net/$port/speed") - - if [ ${carrier:-0} -eq 0 ]; then - printf " | %-5s" "down" - else - [ "$duplex" = "full" ] && duplex=F || duplex=H - printf " | %4d%s" "$speed" "$duplex" - fi - done - - local vlans=$(bridge vlan show dev "$bridge" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') - local vlan - for vlan in $vlans; do - printf " |\n%4d " "$vlan" - - for port in $ports; do - local pvid="" utag="" word - for word in $(bridge vlan show dev "$port" vid "$vlan"); do - case "$word" in - PVID) pvid="*" ;; - "$vlan") utag="t" ;; - Untagged) utag="u" ;; - esac - done - - printf " | %-2s " "$utag$pvid" - done - done - - printf " |\n\n" -} - -show_config() { - config_load network - config_foreach show_bridge vlan_filter -} - - -case "$1" in - show) show_config ;; - apply) apply_config ;; - *) - echo "Usage: ${0##*/} show" - echo " ${0##*/} apply" - exit 1 - ;; -esac From 11ea7ba6984cd184cad06e3c3ebd2418ab75bc65 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 6 Aug 2020 19:13:04 +0200 Subject: [PATCH 32/45] Revert "dsaconfig: introduce package for UCI configuration of VLAN filter rules" This reverts commit 96b87196b0788d4cdaa81a49a65d198d9f6c90d2. This commit was not meant to go into master. Signed-off-by: Jo-Philipp Wich --- package/network/config/dsaconfig/Makefile | 40 --- .../config/dsaconfig/files/dsaconfig.hotplug | 7 - .../config/dsaconfig/files/dsaconfig.include | 11 - .../config/dsaconfig/files/dsaconfig.sh | 306 ------------------ 4 files changed, 364 deletions(-) delete mode 100644 package/network/config/dsaconfig/Makefile delete mode 100644 package/network/config/dsaconfig/files/dsaconfig.hotplug delete mode 100755 package/network/config/dsaconfig/files/dsaconfig.include delete mode 100755 package/network/config/dsaconfig/files/dsaconfig.sh diff --git a/package/network/config/dsaconfig/Makefile b/package/network/config/dsaconfig/Makefile deleted file mode 100644 index 4069022224..0000000000 --- a/package/network/config/dsaconfig/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=dsaconfig -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -define Package/dsaconfig - SECTION:=net - CATEGORY:=Network - MAINTAINER:=Jo-Philipp Wich - TITLE:=UCI configuration support for DSA switch VLAN filtering - DEPENDS:= +ip-bridge +ip-full - PKGARCH:=all -endef - -define Package/dsaconfig/description - This package provides UCI configuration abstraction for VLAN filter rules - on top of DSA switches. -endef - -define Build/Compile -endef - -define Build/Configure -endef - -define Package/dsaconfig/install - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) ./files/dsaconfig.hotplug $(1)/etc/hotplug.d/iface/01-dsaconfig - - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_DATA) ./files/dsaconfig.include $(1)/lib/network/dsaconfig.sh - - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) ./files/dsaconfig.sh $(1)/sbin/dsaconfig -endef - -$(eval $(call BuildPackage,dsaconfig)) diff --git a/package/network/config/dsaconfig/files/dsaconfig.hotplug b/package/network/config/dsaconfig/files/dsaconfig.hotplug deleted file mode 100644 index fc2a489dea..0000000000 --- a/package/network/config/dsaconfig/files/dsaconfig.hotplug +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$ACTION" = ifup ] && [ "$INTERFACE" = loopback ]; then - . /lib/network/dsaconfig.sh - setup_switch -fi - diff --git a/package/network/config/dsaconfig/files/dsaconfig.include b/package/network/config/dsaconfig/files/dsaconfig.include deleted file mode 100755 index 4ac11d8061..0000000000 --- a/package/network/config/dsaconfig/files/dsaconfig.include +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -setup_switch() { - # Skip switch setup on network restart. The netifd process - # will be started afterwards and remove all interfaces again... - if [ "$initscript" = /etc/init.d/network ] && [ "$action" = restart ]; then - return 0 - fi - - /sbin/dsaconfig apply 2>&1 | logger -t dsaconfig -} diff --git a/package/network/config/dsaconfig/files/dsaconfig.sh b/package/network/config/dsaconfig/files/dsaconfig.sh deleted file mode 100755 index f5769bf495..0000000000 --- a/package/network/config/dsaconfig/files/dsaconfig.sh +++ /dev/null @@ -1,306 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh -. /lib/functions/network.sh - -switch_names="" - -warn() { - echo "$@" >&2 -} - -clear_port_vlans() { - local port=$1 - local self=$2 - local vlans=$(bridge vlan show dev "$port" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') - - local vlan - for vlan in $vlans; do - bridge vlan del vid "$vlan" dev "$port" $self - done -} - -lookup_switch() { - local cfg=$1 - local swname - - config_get swname "$cfg" switch - - # Auto-determine switch if not specified ... - if [ -z "$swname" ]; then - case "$switch_names" in - *\ *) - warn "VLAN section '$cfg' does not specify a switch but multiple switches present, using first one" - swname=${switch_names%% *} - ;; - *) - swname=${switch_names} - ;; - esac - - # ... otherwise check if the referenced switch is declared - else - case " $switch_names " in - *" $swname "*) : ;; - *) - warn "Switch '$swname' specified by VLAN section '$cfg' does not exist" - return 1 - ;; - esac - fi - - export -n "switch=$swname" -} - -validate_vid() { - local vid=$1 - - case "$vid" in - [1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-4][0-9][0-9][0-9]) - if [ $vid -gt 4096 ]; then - return 1 - fi - ;; - *) - return 1 - ;; - esac - - return 0 -} - -setup_switch() { - local cfg=$1 - local cpu - - # Read configured CPU port from uci ... - config_get cpu "$cfg" cpu_port - - # ... if unspecified, find first CPU port - if [ -z "$cpu" ]; then - local e - for e in /sys/class/net/*/dsa; do - if [ -d "$e" ]; then - cpu=${e%/dsa} - cpu=${cpu##*/} - break - fi - done - fi - - # Bail out if we cannot determine the CPU port - if [ -z "$cpu" ]; then - warn "Unable to determine CPU port for switch '$cfg'" - return 1 - fi - - append switch_names "$cfg" - - # Prevent netifd from picking up our switch bridge just yet - network_defer_device "$cfg" - - # Increase MTU of CPU port to 1508 to accomodate for VID + DSA tag - ip link set "$cpu" mtu 1508 - ip link set "$cpu" up - - # (Re)create switch bridge device in case it is not yet set up - local filtering=$(cat "/sys/class/net/$cfg/bridge/vlan_filtering" 2>/dev/null) - if [ ${filtering:-0} != 1 ]; then - ip link set "$cfg" down 2>/dev/null - ip link delete dev "$cfg" 2>/dev/null - ip link add name "$cfg" type bridge - echo 1 > "/sys/class/net/$cfg/bridge/vlan_filtering" - fi - - ip link set "$cfg" up - - # Unbridge DSA ports and flush any VLAN filters on them, they're added back later - local port - for port in /sys/class/net/*"/upper_${cfg}"; do - if [ -e "$port" ]; then - port=${port%/upper_*} - port=${port##*/} - - ip link set "$port" nomaster - - # Unbridging the port should already clear VLANs, but be safe - clear_port_vlans "$port" - fi - done - - # Clear any VLANs on the switch bridge, they're added back later - clear_port_vlans "$cfg" self -} - -setup_switch_vlan() { - local cfg=$1 - local switch vlan ports - - config_get switch "$cfg" switch - config_get vlan "$cfg" vlan - config_get ports "$cfg" ports - - lookup_switch "$cfg" || return 1 - validate_vid "$vlan" || { - warn "VLAN section '$cfg' specifies an invalid VLAN ID '$vlan'" - return 1 - } - - # Setup ports - local port tag pvid - for port in $ports; do - tag=${port#*.} - port=${port%.*} - pvid= - - if [ "$tag" != "$port" ] && [ "$tag" = t ]; then - tag=tagged - else - tag=untagged - fi - - # Add the port to the switch bridge and delete the default - # VLAN 1 if it is not yet joined to the switch. - if [ ! -e "/sys/class/net/$port/upper_$switch" ]; then - ip link set dev "$port" up - ip link set dev "$port" master "$switch" - - # Get rid of default VLAN 1 - bridge vlan del vid 1 dev "$port" - fi - - # Promote the first untagged VLAN of this port to the PVID - if [ "$tag" = untagged ] && ! bridge vlan show dev "$port" | grep -qi pvid; then - pvid=pvid - fi - - # Add VLAN filter entry for port - bridge vlan add dev "$port" vid $vlan $pvid $tag - done - - # Make the switch bridge itself handle the VLAN as well - bridge vlan add dev "$switch" self vid $vlan tagged -} - -setup_switch_port() { - local cfg=$1 - local switch port pvid tag - - config_get port "$cfg" port - config_get pvid "$cfg" pvid - - lookup_switch "$cfg" || return 1 - validate_vid "$pvid" || { - warn "Port section '$cfg' specifies an invalid PVID '$pvid'" - return 1 - } - - # Disallow setting the PVID of the switch bridge itself - [ "$port" != "$switch" ] || { - warn "Port section '$cfg' must not change PVID of the switch bridge" - return 1 - } - - # Determine existing VLAN config - local vlanspec=$(bridge vlan show dev "$port" vid "$pvid" 2>/dev/null | sed -ne2p) - echo "$vlanspec" | grep -qi untagged && tag=untagged || tag=tagged - - bridge vlan add vid "$pvid" dev "$port" pvid $tag -} - -apply_config() { - config_load network - config_foreach setup_switch dsa - - # If no switch is explicitely declared, synthesize switch0 - if [ -z "$switch_names" ] && ! setup_switch switch0; then - warn "No DSA switches found" - return 1 - fi - - config_foreach setup_switch_vlan dsa_vlan - config_foreach setup_switch_port dsa_port - - # Ready switch bridge devices - local switch - for switch in $switch_names; do - network_ready_device "$switch" - done -} - -show_switch() { - local switch=$1 - - printf "Switch: %s\n" "$switch" - printf "VLAN/" - - local port ports - for port in "/sys/class/net/$switch/lower_"*; do - port=${port##*/lower_} - - - printf " | %-5s" "$port" - append ports "$port" - done - - printf " |\nLink:" - - for port in $ports; do - local carrier=$(cat "/sys/class/net/$port/carrier") - local duplex=$(cat "/sys/class/net/$port/duplex") - local speed=$(cat "/sys/class/net/$port/speed") - - if [ ${carrier:-0} -eq 0 ]; then - printf " | %-5s" "down" - else - [ "$duplex" = "full" ] && duplex=F || duplex=H - printf " | %4d%s" "$speed" "$duplex" - fi - done - - local vlans=$(bridge vlan show dev "$switch" | sed -ne 's#^[^ ]* \+\([0-9]\+\).*$#\1#p') - local vlan - for vlan in $vlans; do - printf " |\n%4d " "$vlan" - - for port in $ports; do - local pvid="" utag="" word - for word in $(bridge vlan show dev "$port" vid "$vlan"); do - case "$word" in - PVID) pvid="*" ;; - "$vlan") utag="t" ;; - Untagged) utag="u" ;; - esac - done - - printf " | %-2s " "$utag$pvid" - done - done - - printf " |\n\n" -} - -add_switch() { - append switch_names "$1" -} - -show_config() { - config_load network - config_foreach add_switch dsa - - local switch - for switch in ${switch_names:-switch0}; do - show_switch "$switch" - done -} - - -case "$1" in - show) show_config ;; - apply) apply_config ;; - *) - echo "Usage: ${0##*/} show" - echo " ${0##*/} apply" - exit 1 - ;; -esac From 9fb1d4ce8a9134ee4cae6e8191c8ba902b7ee192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 6 Aug 2020 08:52:55 +0200 Subject: [PATCH 33/45] bcm63xx: switch to upstream LED patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch adding support for the second LED HW blinking interval has been merged (linux 5.9). Signed-off-by: Álvaro Fernández Rojas --- ...support-second-hw-blinking-interval.patch} | 139 ++++++++++++------ 1 file changed, 95 insertions(+), 44 deletions(-) rename target/linux/bcm63xx/patches-5.4/{120-leds-bcm6328-support-second-hw-blinking-interval.patch => 030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch} (53%) diff --git a/target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch b/target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch similarity index 53% rename from target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch rename to target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch index 6ed26f2741..9bf6b0fc87 100644 --- a/target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch +++ b/target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch @@ -1,37 +1,66 @@ +From e190f57df3c7e7713687905c14e72fbcbd81c5e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Thu, 4 Jun 2020 15:59:05 +0200 +Subject: [PATCH] leds-bcm6328: support second hw blinking interval +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Right now the driver uses only 3 LED modes: +0: On +1: HW Blinking (Interval 1) +3: Off + +However, the controller supports a second HW blinking interval, which results +in 4 possible LED modes: +0: On +1: HW Blinking (Interval 1) +2: HW Blinking (Interval 2) +3: Off + +Signed-off-by: Álvaro Fernández Rojas +Signed-off-by: Pavel Machek +--- + drivers/leds/leds-bcm6328.c | 97 ++++++++++++++++++++++++++++--------- + 1 file changed, 75 insertions(+), 22 deletions(-) + --- a/drivers/leds/leds-bcm6328.c +++ b/drivers/leds/leds-bcm6328.c -@@ -24,12 +24,16 @@ +@@ -24,12 +24,17 @@ #define BCM6328_LED_MAX_COUNT 24 #define BCM6328_LED_DEF_DELAY 500 -+#define BCM6328_LED_INTERVAL_NUM 2 - #define BCM6328_LED_INTERVAL_MS 20 +-#define BCM6328_LED_INTERVAL_MS 20 - #define BCM6328_LED_INTV_MASK 0x3f +-#define BCM6328_LED_INTV_MASK 0x3f -#define BCM6328_LED_FAST_INTV_SHIFT 6 -#define BCM6328_LED_FAST_INTV_MASK (BCM6328_LED_INTV_MASK << \ - BCM6328_LED_FAST_INTV_SHIFT) -+#define BCM6328_LED_INTV1_SHIFT 0 -+#define BCM6328_LED_INTV1_MASK (BCM6328_LED_INTV_MASK << \ -+ BCM6328_LED_INTV1_SHIFT) -+#define BCM6328_LED_INTV2_SHIFT 6 -+#define BCM6328_LED_INTV2_MASK (BCM6328_LED_INTV_MASK << \ -+ BCM6328_LED_INTV2_SHIFT) ++#define BCM6328_LED_BLINK_DELAYS 2 ++#define BCM6328_LED_BLINK_MS 20 ++ ++#define BCM6328_LED_BLINK_MASK 0x3f ++#define BCM6328_LED_BLINK1_SHIFT 0 ++#define BCM6328_LED_BLINK1_MASK (BCM6328_LED_BLINK_MASK << \ ++ BCM6328_LED_BLINK1_SHIFT) ++#define BCM6328_LED_BLINK2_SHIFT 6 ++#define BCM6328_LED_BLINK2_MASK (BCM6328_LED_BLINK_MASK << \ ++ BCM6328_LED_BLINK2_SHIFT) #define BCM6328_SERIAL_LED_EN BIT(12) #define BCM6328_SERIAL_LED_MUX BIT(13) #define BCM6328_SERIAL_LED_CLK_NPOL BIT(14) -@@ -45,8 +49,8 @@ +@@ -45,8 +50,8 @@ #define BCM6328_LED_MODE_MASK 3 #define BCM6328_LED_MODE_ON 0 -#define BCM6328_LED_MODE_FAST 1 -#define BCM6328_LED_MODE_BLINK 2 -+#define BCM6328_LED_MODE_INTV1 1 -+#define BCM6328_LED_MODE_INTV2 2 ++#define BCM6328_LED_MODE_BLINK1 1 ++#define BCM6328_LED_MODE_BLINK2 2 #define BCM6328_LED_MODE_OFF 3 #define BCM6328_LED_SHIFT(X) ((X) << 1) -@@ -127,12 +131,18 @@ static void bcm6328_led_set(struct led_c +@@ -127,12 +132,18 @@ static void bcm6328_led_set(struct led_c unsigned long flags; spin_lock_irqsave(led->lock, flags); @@ -51,7 +80,28 @@ spin_unlock_irqrestore(led->lock, flags); } -@@ -176,20 +186,59 @@ static int bcm6328_blink_set(struct led_ +@@ -140,8 +151,8 @@ static unsigned long bcm6328_blink_delay + { + unsigned long bcm6328_delay; + +- bcm6328_delay = delay + BCM6328_LED_INTERVAL_MS / 2; +- bcm6328_delay = bcm6328_delay / BCM6328_LED_INTERVAL_MS; ++ bcm6328_delay = delay + BCM6328_LED_BLINK_MS / 2; ++ bcm6328_delay = bcm6328_delay / BCM6328_LED_BLINK_MS; + if (bcm6328_delay == 0) + bcm6328_delay = 1; + +@@ -168,28 +179,68 @@ static int bcm6328_blink_set(struct led_ + return -EINVAL; + } + +- if (delay > BCM6328_LED_INTV_MASK) { ++ if (delay > BCM6328_LED_BLINK_MASK) { + dev_dbg(led_cdev->dev, + "fallback to soft blinking (delay > %ums)\n", +- BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS); ++ BCM6328_LED_BLINK_MASK * BCM6328_LED_BLINK_MS); + return -EINVAL; } spin_lock_irqsave(led->lock, flags); @@ -62,75 +112,76 @@ + * Check if any of the two configurable HW blinking intervals is + * available: + * 1. No LEDs assigned to the HW blinking interval. -+ * 2. LEDs with the same delay assigned. ++ * 2. Only this LED is assigned to the HW blinking interval. ++ * 3. LEDs with the same delay assigned. + */ + if (led->blink_leds[0] == 0 || + led->blink_leds[0] == BIT(led->pin) || + led->blink_delay[0] == delay) { -+ unsigned long val; -+ + unsigned long val; + +- *(led->blink_leds) |= BIT(led->pin); +- *(led->blink_delay) = delay; + /* Add LED to the first HW blinking interval cache */ + led->blink_leds[0] |= BIT(led->pin); + + /* Remove LED from the second HW blinking interval cache */ + led->blink_leds[1] &= ~BIT(led->pin); -+ -+ /* Cache the LED in the first HW blinking interval delay */ + ++ /* Cache first HW blinking interval delay */ + led->blink_delay[0] = delay; + + /* Update the delay for the first HW blinking interval */ -+ val = bcm6328_led_read(led->mem + BCM6328_REG_INIT); -+ val &= ~BCM6328_LED_INTV1_MASK; -+ val |= (delay << BCM6328_LED_INTV1_SHIFT); -+ bcm6328_led_write(led->mem + BCM6328_REG_INIT, val); -+ + val = bcm6328_led_read(led->mem + BCM6328_REG_INIT); +- val &= ~BCM6328_LED_FAST_INTV_MASK; +- val |= (delay << BCM6328_LED_FAST_INTV_SHIFT); ++ val &= ~BCM6328_LED_BLINK1_MASK; ++ val |= (delay << BCM6328_LED_BLINK1_SHIFT); + bcm6328_led_write(led->mem + BCM6328_REG_INIT, val); + +- bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK); + /* Set the LED to first HW blinking interval */ -+ bcm6328_led_mode(led, BCM6328_LED_MODE_INTV1); ++ bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK1); + + rc = 0; + } else if (led->blink_leds[1] == 0 || + led->blink_leds[1] == BIT(led->pin) || + led->blink_delay[1] == delay) { - unsigned long val; - -- *(led->blink_leds) |= BIT(led->pin); -- *(led->blink_delay) = delay; ++ unsigned long val; ++ + /* Remove LED from the first HW blinking interval */ + led->blink_leds[0] &= ~BIT(led->pin); + + /* Add LED to the second HW blinking interval */ + led->blink_leds[1] |= BIT(led->pin); - -+ /* Cache the LED in the first HW blinking interval delay */ ++ ++ /* Cache second HW blinking interval delay */ + led->blink_delay[1] = delay; + + /* Update the delay for the second HW blinking interval */ - val = bcm6328_led_read(led->mem + BCM6328_REG_INIT); -- val &= ~BCM6328_LED_FAST_INTV_MASK; -- val |= (delay << BCM6328_LED_FAST_INTV_SHIFT); -+ val &= ~BCM6328_LED_INTV2_MASK; -+ val |= (delay << BCM6328_LED_INTV2_SHIFT); - bcm6328_led_write(led->mem + BCM6328_REG_INIT, val); - -- bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK); ++ val = bcm6328_led_read(led->mem + BCM6328_REG_INIT); ++ val &= ~BCM6328_LED_BLINK2_MASK; ++ val |= (delay << BCM6328_LED_BLINK2_SHIFT); ++ bcm6328_led_write(led->mem + BCM6328_REG_INIT, val); ++ + /* Set the LED to second HW blinking interval */ -+ bcm6328_led_mode(led, BCM6328_LED_MODE_INTV2); ++ bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK2); + rc = 0; } else { dev_dbg(led_cdev->dev, -@@ -363,11 +412,13 @@ static int bcm6328_leds_probe(struct pla +@@ -363,11 +414,13 @@ static int bcm6328_leds_probe(struct pla if (!lock) return -ENOMEM; - blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL); -+ blink_leds = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM, ++ blink_leds = devm_kcalloc(dev, BCM6328_LED_BLINK_DELAYS, + sizeof(*blink_leds), GFP_KERNEL); if (!blink_leds) return -ENOMEM; - blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL); -+ blink_delay = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM, ++ blink_delay = devm_kcalloc(dev, BCM6328_LED_BLINK_DELAYS, + sizeof(*blink_delay), GFP_KERNEL); if (!blink_delay) return -ENOMEM; From f41a40001af80ff73415e3617655b1fc85c8171f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 6 Aug 2020 16:12:21 +0200 Subject: [PATCH 34/45] bcm63xx: switch to upstream endif comments patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows better context for board patches and we no longer need a downstream patch for that. Signed-off-by: Álvaro Fernández Rojas --- ...v5.9-MIPS-BCM63xx-add-endif-comments.patch | 155 ++++++++++++++++++ ...ister-OHCI-controller-if-board-enabl.patch | 2 +- ...ister-EHCI-controller-if-board-enabl.patch | 2 +- ...e-device-registration-code-into-its-.patch | 14 +- ...s-a-mac-addresss-allocator-to-board-.patch | 2 +- .../patches-5.4/309-cfe_version_mod.patch | 2 +- ...22-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch | 2 +- ...IPS-BCM63XX-add-support-for-BCM63268.patch | 2 +- ...MIPS-BCM63XX-add-support-for-BCM6318.patch | 2 +- .../351-set-board-usbh-ports.patch | 2 +- ...ow-building-support-for-more-than-on.patch | 2 +- ...BCM63XX-make-fallback-sprom-optional.patch | 10 +- ...-support-for-matching-the-board_info.patch | 8 +- ...ulate-the-compatible-to-board_info-l.patch | 2 +- ...-register-lookup-for-ephy-reset-gpio.patch | 2 +- ...91-MIPS-BCM63XX-do-not-register-uart.patch | 12 +- ...MIPS-BCM63XX-remove-leds-and-buttons.patch | 8 +- .../patches-5.4/427-boards_probe_switch.patch | 12 +- ...low_better_context_for_board_patches.patch | 56 ------- .../bcm63xx/patches-5.4/500-board-D4PW.patch | 10 +- .../bcm63xx/patches-5.4/501-board-NB4.patch | 8 +- .../patches-5.4/502-board-96338W2_E7T.patch | 6 +- .../patches-5.4/503-board-CPVA642.patch | 6 +- .../504-board_dsl_274xb_rev_c.patch | 8 +- .../patches-5.4/505-board_spw500v.patch | 10 +- .../patches-5.4/506-board_gw6200_gw6000.patch | 4 +- .../bcm63xx/patches-5.4/507-board-MAGIC.patch | 10 +- .../bcm63xx/patches-5.4/508-board_hw553.patch | 8 +- .../patches-5.4/509-board_rta1320_16m.patch | 6 +- .../patches-5.4/510-board_spw303v.patch | 8 +- .../patches-5.4/511-board_V2500V.patch | 12 +- .../patches-5.4/512-board_BTV2110.patch | 8 +- .../patches-5.4/514-board_ct536_ct5621.patch | 8 +- .../patches-5.4/515-board_DWV-S0_fixes.patch | 2 +- .../patches-5.4/516-board_96348A-122.patch | 8 +- .../patches-5.4/517_board_CPVA502plus.patch | 8 +- ...63xx-add-support-for-96368MVWG-board.patch | 11 +- ...3xx-add-support-for-96368MVNgr-board.patch | 10 +- ...CM63XX-add-963281TAN-reference-board.patch | 8 +- .../522-board_dsl_274xb_rev_f.patch | 6 +- .../patches-5.4/523-board_96348w3.patch | 10 +- .../patches-5.4/524-board_CT6373-1.patch | 8 +- .../525-board_dva-g3810bn-tl-1.patch | 10 +- .../bcm63xx/patches-5.4/526-board_nb6.patch | 13 +- .../patches-5.4/527-board_fast2604.patch | 4 +- .../patches-5.4/528-board_A4001N1.patch | 6 +- .../patches-5.4/529-board_AR-5387un.patch | 6 +- .../patches-5.4/530-board_AR-5381u.patch | 6 +- .../patches-5.4/531-board_rta770bw.patch | 8 +- .../bcm63xx/patches-5.4/532-board_hw556.patch | 8 +- .../patches-5.4/533-board_rta770w.patch | 6 +- .../patches-5.4/534-board_fast2704.patch | 6 +- .../patches-5.4/535-board_fast2504n.patch | 12 +- .../patches-5.4/536-board_96318ref.patch | 8 +- .../patches-5.4/537-board_96318ref_p300.patch | 8 +- .../patches-5.4/538-board_bcm963269bhr.patch | 10 +- .../patches-5.4/539-board_AR1004G.patch | 8 +- .../patches-5.4/540-board_vw6339gu.patch | 10 +- .../patches-5.4/541-board_963268gu_p300.patch | 10 +- .../patches-5.4/542-board_WAP-5813n.patch | 8 +- .../patches-5.4/543-board_VR-3025u.patch | 8 +- .../patches-5.4/544-board_VR-3025un.patch | 8 +- .../patches-5.4/545-board_P870HW-51a_v2.patch | 6 +- .../bcm63xx/patches-5.4/546-board_hw520.patch | 6 +- .../patches-5.4/547-board_A4001N.patch | 4 +- .../patches-5.4/548-board_dsl-2751b_e1.patch | 6 +- .../549-board_DGND3700v1_3800B.patch | 6 +- .../patches-5.4/550-board_homehub2a.patch | 6 +- .../patches-5.4/551-board_HG655b.patch | 6 +- .../patches-5.4/552-board_fast2704n.patch | 6 +- .../patches-5.4/553-board_VR-3026e.patch | 8 +- .../patches-5.4/554-board_R5010UNv2.patch | 6 +- .../bcm63xx/patches-5.4/555-board_HG622.patch | 6 +- .../patches-5.4/556-board_EVG2000.patch | 6 +- .../patches-5.4/557-board_AV4202N.patch | 10 +- .../patches-5.4/558-board_VH4032N.patch | 6 +- .../patches-5.4/559-board_R1000H.patch | 6 +- .../patches-5.4/560-board_AR-5315u.patch | 6 +- .../patches-5.4/561-board_AD1018.patch | 6 +- .../bcm63xx/patches-5.4/562-board_sr102.patch | 8 +- .../patches-5.4/563-board-VR-3032u.patch | 8 +- .../patches-5.4/564-board-DGND3700v2.patch | 12 +- .../patches-5.4/565-board-VG-8050.patch | 6 +- .../patches-5.4/566-board-HG253s-v2.patch | 10 +- ...67-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 4 +- .../bcm63xx/patches-5.4/568-board-H500s.patch | 8 +- 86 files changed, 451 insertions(+), 354 deletions(-) create mode 100644 target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch delete mode 100644 target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch new file mode 100644 index 0000000000..bb56363e39 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch @@ -0,0 +1,155 @@ +From c425423a075718eac625c78351fa5907d4f3a9de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Mon, 8 Jun 2020 12:18:28 +0200 +Subject: [PATCH] MIPS: BCM63xx: add endif comments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are plenty of ifdefs in board_bcm963xx.c without endif comments. +Let's make the code easier to follow by adding proper comments. + +Signed-off-by: Álvaro Fernández Rojas +Signed-off-by: Thomas Bogendoerfer +--- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +++++++++++------------ + 1 file changed, 15 insertions(+), 18 deletions(-) + +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -67,7 +67,7 @@ static struct board_info __initdata boar + .ephy_reset_gpio = 36, + .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_3368 */ + + /* + * known 6328 boards +@@ -115,7 +115,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6328 */ + + /* + * known 6338 boards +@@ -204,7 +204,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6338 */ + + /* + * known 6345 boards +@@ -216,7 +216,7 @@ static struct board_info __initdata boar + + .has_uart0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6345 */ + + /* + * known 6348 boards +@@ -464,7 +464,6 @@ static struct board_info __initdata boar + }, + }; + +- + static struct board_info __initdata board_DV201AMR = { + .name = "DV201AMR", + .expected_cpu_id = 0x6348, +@@ -505,7 +504,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6348 */ + + /* + * known 6358 boards +@@ -530,7 +529,6 @@ static struct board_info __initdata boar + .force_duplex_full = 1, + }, + +- + .has_ohci0 = 1, + .has_pccard = 1, + .has_ehci0 = 1, +@@ -654,7 +652,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6358 */ + + /* + * all boards +@@ -662,17 +660,17 @@ static struct board_info __initdata boar + static const struct board_info __initconst *bcm963xx_boards[] = { + #ifdef CONFIG_BCM63XX_CPU_3368 + &board_cvg834g, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_3368 */ + #ifdef CONFIG_BCM63XX_CPU_6328 + &board_96328avng, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6328 */ + #ifdef CONFIG_BCM63XX_CPU_6338 + &board_96338gw, + &board_96338w, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6338 */ + #ifdef CONFIG_BCM63XX_CPU_6345 + &board_96345gw2, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6345 */ + #ifdef CONFIG_BCM63XX_CPU_6348 + &board_96348r, + &board_96348gw, +@@ -682,14 +680,13 @@ static const struct board_info __initcon + &board_DV201AMR, + &board_96348gw_a, + &board_rta1025w_16, +-#endif +- ++#endif /* CONFIG_BCM63XX_CPU_6348 */ + #ifdef CONFIG_BCM63XX_CPU_6358 + &board_96358vw, + &board_96358vw2, + &board_AGPFS0, + &board_DWVS0, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6358 */ + }; + + /* +@@ -728,7 +725,7 @@ int bcm63xx_get_fallback_sprom(struct ss + return -EINVAL; + } + } +-#endif ++#endif /* CONFIG_SSB_PCIHOST */ + + /* + * return board name for /proc/cpuinfo +@@ -807,7 +804,7 @@ void __init board_prom_init(void) + if (BCMCPU_IS_6348()) + val |= GPIO_MODE_6348_G2_PCI; + } +-#endif ++#endif /* CONFIG_PCI */ + + if (board.has_pccard) { + if (BCMCPU_IS_6348()) +@@ -892,7 +889,7 @@ int __init board_register_devices(void) + &bcm63xx_get_fallback_sprom) < 0) + pr_err("failed to register fallback SPROM\n"); + } +-#endif ++#endif /* CONFIG_SSB_PCIHOST */ + + bcm63xx_spi_register(); + diff --git a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch index 6fc5551884..80427d7fd3 100644 --- a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include -@@ -881,6 +882,9 @@ int __init board_register_devices(void) +@@ -878,6 +879,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch index 3db82bb483..e8c2588b67 100644 --- a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include #include -@@ -882,6 +883,9 @@ int __init board_register_devices(void) +@@ -879,6 +880,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index 652eb6c9bf..f39c9a8122 100644 --- a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski /* * known 3368 boards */ -@@ -695,52 +683,6 @@ static const struct board_info __initcon +@@ -692,52 +680,6 @@ static const struct board_info __initcon }; /* @@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski - return -EINVAL; - } -} --#endif +-#endif /* CONFIG_SSB_PCIHOST */ - -/* - * return board name for /proc/cpuinfo @@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski * early init callback, read nvram data from flash and checksum it */ void __init board_prom_init(void) -@@ -785,137 +727,15 @@ void __init board_prom_init(void) +@@ -782,137 +724,15 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ @@ -144,8 +144,8 @@ Signed-off-by: Jonas Gorski - bcm63xx_pci_enabled = 1; - if (BCMCPU_IS_6348()) - val |= GPIO_MODE_6348_G2_PCI; - } --#endif +- } +-#endif /* CONFIG_PCI */ - - if (board.has_pccard) { - if (BCMCPU_IS_6348()) @@ -235,8 +235,8 @@ Signed-off-by: Jonas Gorski - if (ssb_arch_register_fallback_sprom( - &bcm63xx_get_fallback_sprom) < 0) - pr_err("failed to register fallback SPROM\n"); -- } --#endif + } +-#endif /* CONFIG_SSB_PCIHOST */ - - bcm63xx_spi_register(); - diff --git a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch index 7f9479b825..f34e222314 100644 --- a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch +++ b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch @@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -727,7 +727,8 @@ void __init board_prom_init(void) +@@ -724,7 +724,8 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ diff --git a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch index fe6c6d2909..3a0d08074d 100644 --- a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch +++ b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -707,10 +707,20 @@ void __init board_prom_init(void) +@@ -704,10 +704,20 @@ void __init board_prom_init(void) /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; diff --git a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index ec978a031d..8f50dd689b 100644 --- a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -290,6 +290,9 @@ config BCM63XX +@@ -291,6 +291,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU diff --git a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index aba4b9415a..b1831026d4 100644 --- a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski source "arch/mips/bcm63xx/boards/Kconfig" --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -697,7 +697,7 @@ void __init board_prom_init(void) +@@ -694,7 +694,7 @@ void __init board_prom_init(void) /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address */ diff --git a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index a022f8c5f0..c297321b64 100644 --- a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -35,7 +35,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 select SYS_HAS_CPU_BMIPS4350 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -697,7 +697,7 @@ void __init board_prom_init(void) +@@ -694,7 +694,7 @@ void __init board_prom_init(void) /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address */ diff --git a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch index 531adc9f1b..2543ad7922 100644 --- a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch +++ b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -576,6 +576,7 @@ static struct board_info __initdata boar +@@ -574,6 +574,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, diff --git a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch index 51908d99d2..6301f73bca 100644 --- a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch +++ b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski +endmenu --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -686,7 +686,7 @@ static const struct board_info __initcon +@@ -683,7 +683,7 @@ static const struct board_info __initcon /* * early init callback, read nvram data from flash and checksum it */ diff --git a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch index f540eabeff..170578f8bc 100644 --- a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch +++ b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch @@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -461,6 +468,7 @@ static struct board_info __initdata boar +@@ -460,6 +467,7 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_pci = 1, @@ -82,7 +82,7 @@ Signed-off-by: Jonas Gorski .has_ohci0 = 1, .has_enet0 = 1, -@@ -483,6 +491,7 @@ static struct board_info __initdata boar +@@ -482,6 +490,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -509,6 +518,7 @@ static struct board_info __initdata boar +@@ -508,6 +517,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -98,7 +98,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -561,6 +571,7 @@ static struct board_info __initdata boar +@@ -559,6 +569,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -106,7 +106,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -632,6 +643,7 @@ static struct board_info __initdata boar +@@ -630,6 +641,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, diff --git a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch index 7069c231de..db30de2183 100644 --- a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch +++ b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch @@ -16,8 +16,8 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -695,6 +695,10 @@ static const struct board_info __initcon - #endif +@@ -692,6 +692,10 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; +static struct of_device_id const bcm963xx_boards_dt[] = { @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski /* * early init callback, read nvram data from flash and checksum it */ -@@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void) +@@ -703,6 +707,7 @@ void __init board_bcm963xx_init(void) char *board_name = NULL; u32 val; struct bcm_hcs *hcs; @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address -@@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void) +@@ -742,6 +747,16 @@ void __init board_bcm963xx_init(void) } else { board_name = bcm63xx_nvram_get_name(); } diff --git a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch index 5dd4cbaeec..d002b09f3d 100644 --- a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch +++ b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -696,6 +696,48 @@ static const struct board_info __initcon +@@ -693,6 +693,48 @@ static const struct board_info __initcon }; static struct of_device_id const bcm963xx_boards_dt[] = { diff --git a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch index c061ec4e60..890f326bf4 100644 --- a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch +++ b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski - .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, + .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_3368 */ --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c diff --git a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch index e9d4481d14..bab5bbee6f 100644 --- a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch +++ b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch @@ -175,7 +175,7 @@ - - .has_uart0 = 1, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ @@ -217,7 +209,6 @@ static struct board_info __initdata boar .name = "96348R", @@ -217,7 +217,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -466,7 +453,6 @@ static struct board_info __initdata boar +@@ -465,7 +452,6 @@ static struct board_info __initdata boar .name = "DV201AMR", .expected_cpu_id = 0x6348, @@ -225,7 +225,7 @@ .has_pci = 1, .use_fallback_sprom = 1, .has_ohci0 = 1, -@@ -487,7 +473,6 @@ static struct board_info __initdata boar +@@ -486,7 +472,6 @@ static struct board_info __initdata boar .name = "96348GW-A", .expected_cpu_id = 0x6348, @@ -233,7 +233,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -514,7 +499,6 @@ static struct board_info __initdata boar +@@ -513,7 +498,6 @@ static struct board_info __initdata boar .name = "96358VW", .expected_cpu_id = 0x6358, @@ -241,7 +241,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -567,7 +551,6 @@ static struct board_info __initdata boar +@@ -565,7 +549,6 @@ static struct board_info __initdata boar .name = "96358VW2", .expected_cpu_id = 0x6358, @@ -249,7 +249,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -617,7 +600,6 @@ static struct board_info __initdata boar +@@ -615,7 +598,6 @@ static struct board_info __initdata boar .name = "AGPF-S0", .expected_cpu_id = 0x6358, diff --git a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch index e1394267b5..8aaf093dff 100644 --- a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch +++ b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch @@ -58,7 +58,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons - }, - }, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ @@ -119,35 +82,6 @@ static struct board_info __initdata boar }, @@ -130,7 +130,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons - }, - }, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ @@ -217,36 +122,6 @@ static struct board_info __initdata boar .has_phy = 1, @@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_FAST2404 = { -@@ -518,33 +306,6 @@ static struct board_info __initdata boar +@@ -516,33 +304,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96358vw2 = { -@@ -571,29 +332,6 @@ static struct board_info __initdata boar +@@ -569,29 +330,6 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, .num_usbh_ports = 2, diff --git a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch index 4b206a259e..0c00ff0da7 100644 --- a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch +++ b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch @@ -63,7 +63,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -252,6 +266,8 @@ static struct board_info __initdata boar +@@ -251,6 +265,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -72,7 +72,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -271,6 +287,8 @@ static struct board_info __initdata boar +@@ -270,6 +286,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -81,7 +81,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -298,6 +316,8 @@ static struct board_info __initdata boar +@@ -297,6 +315,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -90,7 +90,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -323,6 +343,8 @@ static struct board_info __initdata boar +@@ -321,6 +341,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -99,7 +99,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -348,6 +370,8 @@ static struct board_info __initdata boar +@@ -346,6 +368,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -108,7 +108,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -371,6 +395,8 @@ static struct board_info __initdata boar +@@ -369,6 +393,8 @@ static struct board_info __initdata boar }, .enet1 = { diff --git a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch deleted file mode 100644 index dd63183a08..0000000000 --- a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -46,7 +46,7 @@ static struct board_info __initdata boar - .ephy_reset_gpio = 36, - .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_3368 */ - - /* - * known 6328 boards -@@ -65,7 +65,7 @@ static struct board_info __initdata boar - .port_no = 0, - }, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6328 */ - - /* - * known 6338 boards -@@ -98,7 +98,7 @@ static struct board_info __initdata boar - .force_duplex_full = 1, - }, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6338 */ - - /* - * known 6345 boards -@@ -108,7 +108,7 @@ static struct board_info __initdata boar - .name = "96345GW2", - .expected_cpu_id = 0x6345, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6345 */ - - /* - * known 6348 boards -@@ -295,7 +295,7 @@ static struct board_info __initdata boar - - .has_ohci0 = 1, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6348 */ - - /* - * known 6358 boards -@@ -403,7 +403,7 @@ static struct board_info __initdata boar - - .has_ohci0 = 1, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6358 */ - - /* - * all boards diff --git a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch index 456b2a4466..cad12be975 100644 --- a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -295,6 +295,21 @@ static struct board_info __initdata boar +@@ -294,6 +294,21 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -22,15 +22,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -431,6 +446,7 @@ static const struct board_info __initcon +@@ -429,6 +444,7 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, + &board_96348_D4PW, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -462,6 +478,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -459,6 +475,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch index 41c8a7e862..19bf51a160 100644 --- a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -418,6 +418,60 @@ static struct board_info __initdata boar +@@ -416,6 +416,60 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -61,16 +61,16 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -454,6 +508,8 @@ static const struct board_info __initcon +@@ -451,6 +505,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, + &board_nb4_ser_r0, + &board_nb4_fxc_r1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -495,6 +551,8 @@ static struct of_device_id const bcm963x +@@ -492,6 +548,8 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, diff --git a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch index 69cc716e1a..8f81f7d4f9 100644 --- a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch +++ b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -487,6 +501,7 @@ static const struct board_info __initcon +@@ -485,6 +499,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, + &board_96338w2_e7t, - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -524,6 +539,7 @@ static struct of_device_id const bcm963x +@@ -521,6 +536,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch index 9e3c4e0081..c85702fa84 100644 --- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -385,6 +385,25 @@ static struct board_info __initdata boar +@@ -383,6 +383,25 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -522,6 +541,7 @@ static const struct board_info __initcon +@@ -519,6 +538,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -34,7 +34,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -569,6 +589,7 @@ static struct of_device_id const bcm963x +@@ -566,6 +586,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch index e78832ecb2..f4df4443d5 100644 --- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -452,6 +452,22 @@ static struct board_info __initdata boar +@@ -450,6 +450,22 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -23,15 +23,15 @@ static struct board_info __initdata board_nb4_ser_r0 = { .name = "NB4-SER-r0", .expected_cpu_id = 0x6358, -@@ -543,6 +559,7 @@ static const struct board_info __initcon +@@ -540,6 +556,7 @@ static const struct board_info __initcon &board_AGPFS0, &board_CPVA642, &board_DWVS0, + &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, - #endif -@@ -582,6 +599,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -579,6 +596,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch index f5ca73d7e2..837a6ff659 100644 --- a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -324,6 +324,36 @@ static struct board_info __initdata boar +@@ -323,6 +323,36 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -37,15 +37,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -551,6 +581,7 @@ static const struct board_info __initcon +@@ -549,6 +579,7 @@ static const struct board_info __initcon &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW, + &board_spw500v, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -592,6 +623,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -589,6 +620,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch index 77948d19fc..5bef9b4d27 100644 --- a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch @@ -49,7 +49,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -574,6 +616,8 @@ static const struct board_info __initcon +@@ -572,6 +614,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -58,7 +58,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -624,6 +668,8 @@ static struct of_device_id const bcm963x +@@ -621,6 +665,8 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, diff --git a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch index 3a88e01005..4d20a18fac 100644 --- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -396,6 +396,31 @@ static struct board_info __initdata boar +@@ -395,6 +395,31 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -32,15 +32,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -626,6 +651,7 @@ static const struct board_info __initcon +@@ -624,6 +649,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, + &board_96348sv, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -670,6 +696,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -667,6 +693,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch index e6e94f71ff..4983bc2676 100644 --- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -618,6 +618,32 @@ static struct board_info __initdata boar +@@ -616,6 +616,32 @@ static struct board_info __initdata boar .has_ehci0 = 1, .num_usbh_ports = 2, }; @@ -33,15 +33,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -663,6 +689,7 @@ static const struct board_info __initcon +@@ -660,6 +686,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, + &board_HW553, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -706,6 +733,7 @@ static struct of_device_id const bcm963x +@@ -703,6 +730,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch index cfe55552f3..fdfe686ebe 100644 --- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch +++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -660,6 +674,7 @@ static const struct board_info __initcon +@@ -658,6 +672,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, + &board_rta1320_16m, - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -704,6 +719,7 @@ static struct of_device_id const bcm963x +@@ -701,6 +716,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch index 69432c94dc..2ab72d47d1 100644 --- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -658,6 +658,20 @@ static struct board_info __initdata boar +@@ -656,6 +656,20 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -705,6 +719,7 @@ static const struct board_info __initcon +@@ -702,6 +716,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, + &board_spw303v, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -756,6 +771,7 @@ static struct of_device_id const bcm963x +@@ -753,6 +768,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index 47590af6e3..e7082ded75 100644 --- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -435,6 +435,26 @@ static struct board_info __initdata boar +@@ -434,6 +434,26 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, }; @@ -27,15 +27,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -707,6 +727,7 @@ static const struct board_info __initcon +@@ -705,6 +725,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, + &board_V2500V_BB, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -746,6 +767,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -743,6 +764,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -43,7 +43,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -805,6 +827,22 @@ void __init board_bcm963xx_init(void) +@@ -802,6 +824,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch index 4c14ea4413..0259432f96 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch @@ -25,15 +25,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -728,6 +746,7 @@ static const struct board_info __initcon +@@ -726,6 +744,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, + &board_V2110, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -767,6 +786,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -764,6 +783,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch index acb533d0e8..4f8d33ff07 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch @@ -34,15 +34,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -747,6 +774,7 @@ static const struct board_info __initcon +@@ -745,6 +772,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, + &board_ct536_ct5621, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -788,6 +816,8 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -785,6 +813,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch index 9ccb29bddd..35e93b1aa2 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch +++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -626,6 +626,7 @@ static struct board_info __initdata boar +@@ -624,6 +624,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch index a6de00d36b..0843a99c41 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch @@ -31,15 +31,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -776,6 +800,7 @@ static const struct board_info __initcon +@@ -774,6 +798,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, + &board_96348A_122, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -818,6 +843,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -815,6 +840,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, diff --git a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch index 25e7f9ff0a..a210ebb690 100644 --- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch @@ -34,15 +34,15 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", -@@ -801,6 +828,7 @@ static const struct board_info __initcon +@@ -799,6 +826,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, + &board_CPVA502plus, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -853,6 +881,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -850,6 +878,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch index 17087b36a5..c33b493556 100644 --- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -792,6 +792,58 @@ static struct board_info __initdata boar +@@ -790,6 +790,58 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -69,18 +69,17 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -843,6 +895,10 @@ static const struct board_info __initcon +@@ -840,6 +892,9 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, - #endif -+ + #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6368 + &board_96368mvwg, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6368 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -903,6 +959,7 @@ static struct of_device_id const bcm963x +@@ -900,6 +955,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch index 03bda96dff..5839209a4e 100644 --- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -841,6 +841,45 @@ static struct board_info __initdata boar +@@ -839,6 +839,45 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -55,15 +55,15 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -898,6 +937,7 @@ static const struct board_info __initcon - +@@ -894,6 +933,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, + &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ }; -@@ -959,6 +999,7 @@ static struct of_device_id const bcm963x +@@ -955,6 +995,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 522d99976f..0518053070 100644 --- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -50,15 +50,15 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -918,6 +952,7 @@ static const struct board_info __initcon - #endif +@@ -916,6 +950,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_963281TAN, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -974,6 +1009,7 @@ static struct of_device_id const bcm963x +@@ -970,6 +1005,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch index b91fff0695..ad3e689802 100644 --- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch @@ -62,15 +62,15 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -953,6 +998,7 @@ static const struct board_info __initcon +@@ -951,6 +996,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, + &board_dsl_274xb_f1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1011,6 +1057,7 @@ static struct of_device_id const bcm963x +@@ -1007,6 +1053,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch index 3a27db85c1..06bbd5d0fe 100644 --- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -568,6 +568,24 @@ static struct board_info __initdata boar +@@ -567,6 +567,24 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -25,15 +25,15 @@ static struct board_info __initdata board_96348_D4PW = { .name = "D-4P-W", .expected_cpu_id = 0x6348, -@@ -1028,6 +1046,7 @@ static const struct board_info __initcon +@@ -1026,6 +1044,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, + &board_96348W3, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1083,6 +1102,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -1079,6 +1098,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch index 0cfcc173fe..4a8be4c4d6 100644 --- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -874,6 +874,30 @@ static struct board_info __initdata boar +@@ -872,6 +872,30 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -31,15 +31,15 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1058,6 +1082,7 @@ static const struct board_info __initcon +@@ -1055,6 +1079,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, + &board_ct6373_1, &board_HW553, &board_spw303v, - #endif -@@ -1116,6 +1141,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1112,6 +1137,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch index 45e8717be0..5c356cfe04 100644 --- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -937,6 +937,33 @@ static struct board_info __initdata boar +@@ -935,6 +935,33 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -34,15 +34,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1085,6 +1112,7 @@ static const struct board_info __initcon +@@ -1082,6 +1109,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, + &board_DVAG3810BN, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1144,6 +1172,7 @@ static struct of_device_id const bcm963x + &board_96368mvwg, +@@ -1140,6 +1168,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch index b4de7cb078..888bc7fc5a 100644 --- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -966,6 +966,32 @@ static struct board_info __initdata boar +@@ -964,6 +964,32 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -33,18 +33,17 @@ /* * known 6368 boards */ -@@ -1115,6 +1141,10 @@ static const struct board_info __initcon +@@ -1111,6 +1137,9 @@ static const struct board_info __initcon + &board_spw303v, &board_DVAG3810BN, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6362 + &board_nb6, -+#endif -+ ++#endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x +@@ -1179,6 +1208,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch index 9e42c40b57..bebdd8be14 100644 --- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch @@ -23,7 +23,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1112,6 +1128,7 @@ static const struct board_info __initcon +@@ -1110,6 +1126,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x +@@ -1182,6 +1199,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch index 0cecd9cb6c..dd13df4920 100644 --- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch @@ -50,15 +50,15 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1109,6 +1152,7 @@ static const struct board_info __initcon +@@ -1107,6 +1150,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, + &board_A4001N1, &board_dsl_274xb_f1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x +@@ -1169,6 +1213,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch index f2af2c5b2c..d3088c5847 100644 --- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch @@ -79,15 +79,15 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1151,6 +1223,7 @@ static const struct board_info __initcon - #endif +@@ -1149,6 +1221,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5387un, &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x +@@ -1216,6 +1289,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch index dc8efed328..1842471033 100644 --- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch @@ -61,15 +61,15 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1223,6 +1277,7 @@ static const struct board_info __initcon - #endif +@@ -1221,6 +1275,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5381u, &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x +@@ -1289,6 +1344,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch index d56df55622..31e2192e0d 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1291,6 +1305,7 @@ static const struct board_info __initcon - #endif +@@ -1289,6 +1303,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, + &board_rta770bw, - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x +@@ -1356,6 +1371,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch index cf55255cd1..f9ca476ed4 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -1123,6 +1124,92 @@ static struct board_info __initdata boar +@@ -1121,6 +1122,92 @@ static struct board_info __initdata boar }, }; @@ -101,7 +101,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1341,6 +1428,9 @@ static const struct board_info __initcon +@@ -1338,6 +1425,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -110,8 +110,8 @@ + &board_HW556_C, &board_spw303v, &board_DVAG3810BN, - #endif -@@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1408,6 +1498,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch index c78e59efd3..b6092ed068 100644 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch @@ -26,15 +26,15 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1393,6 +1412,7 @@ static const struct board_info __initcon +@@ -1391,6 +1410,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, + &board_rta770w, - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1467,6 +1487,7 @@ static struct of_device_id const bcm963x +@@ -1462,6 +1482,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch index 358e97480d..23b90002ff 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -56,15 +56,15 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1402,6 +1439,7 @@ static const struct board_info __initcon +@@ -1400,6 +1437,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, + &board_FAST2704V2, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x +@@ -1472,6 +1510,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch index ff0440772b..7ad967e3a7 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1332,6 +1332,41 @@ static struct board_info __initdata boar +@@ -1330,6 +1330,41 @@ static struct board_info __initdata boar }, }, }; @@ -48,15 +48,15 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1495,6 +1530,7 @@ static const struct board_info __initcon - +@@ -1491,6 +1526,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_fast2504n, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x + &board_96368mvwg, +@@ -1571,6 +1607,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index c9c532d30e..403599c1de 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -56,17 +56,17 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1467,6 +1516,9 @@ static const struct board_info __initcon +@@ -1465,6 +1514,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, - #endif + #endif /* CONFIG_BCM63XX_CPU_3368 */ +#ifdef CONFIG_BCM63XX_CPU_6318 + &board_96318ref, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x +@@ -1539,6 +1591,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index f4ff4fd691..2e85271470 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -51,15 +51,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1518,6 +1562,7 @@ static const struct board_info __initcon - #endif +@@ -1516,6 +1560,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, + &board_96318ref_p300, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x +@@ -1593,6 +1638,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index d5af2f0d1c..de4bff8b9d 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar +@@ -1552,6 +1552,50 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -51,17 +51,17 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1634,6 +1678,9 @@ static const struct board_info __initcon +@@ -1629,6 +1673,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ +#ifdef CONFIG_BCM63XX_CPU_63268 + &board_963269bhr, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_63268 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x +@@ -1716,6 +1763,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index 85521b44be..2580c8eb72 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -30,15 +30,15 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -1649,6 +1664,7 @@ static const struct board_info __initcon +@@ -1647,6 +1662,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, + &board_96348gw_10_AR1004G, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -1708,6 +1724,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index da9000ac3e..d3e1ec6de4 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1610,6 +1610,53 @@ static struct board_info __initdata boar +@@ -1608,6 +1608,53 @@ static struct board_info __initdata boar }, }, }; @@ -54,15 +54,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1696,6 +1743,7 @@ static const struct board_info __initcon - #endif +@@ -1691,6 +1738,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, + &board_vw6339gu, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1786,6 +1834,7 @@ static struct of_device_id const bcm963x +@@ -1781,6 +1829,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index 2cd09b69e2..5a422b54de 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1572,6 +1572,72 @@ static struct board_info __initdata boar +@@ -1570,6 +1570,72 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -73,15 +73,15 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1742,6 +1808,7 @@ static const struct board_info __initcon +@@ -1737,6 +1803,7 @@ static const struct board_info __initcon &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 + &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, - #endif -@@ -1833,6 +1900,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_63268 */ +@@ -1828,6 +1895,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index c08c2c0fc0..5466c0c4f4 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar +@@ -1564,6 +1566,47 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -57,15 +57,15 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1806,6 +1849,7 @@ static const struct board_info __initcon +@@ -1801,6 +1844,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1898,6 +1942,7 @@ static struct of_device_id const bcm963x +@@ -1893,6 +1937,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index b92f032047..31cfb76898 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1569,6 +1569,59 @@ static struct board_info __initdata boar +@@ -1567,6 +1567,59 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1849,6 +1902,7 @@ static const struct board_info __initcon +@@ -1844,6 +1897,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_VR3025u, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1942,6 +1996,7 @@ static struct of_device_id const bcm963x +@@ -1937,6 +1991,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index ec0e13db56..207f6810fe 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1622,6 +1622,59 @@ static struct board_info __initdata boar +@@ -1620,6 +1620,59 @@ static struct board_info __initdata boar }, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1903,6 +1956,7 @@ static const struct board_info __initcon +@@ -1898,6 +1951,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, + &board_VR3025un, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1997,6 +2051,7 @@ static struct of_device_id const bcm963x +@@ -1992,6 +2046,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index 6b60a3fa86..2941a954cf 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1578,6 +1578,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1576,6 +1576,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1955,6 +1997,7 @@ static const struct board_info __initcon +@@ -1950,6 +1992,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2053,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2048,6 +2091,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index aaf662a76c..e7751c353e 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1264,6 +1264,36 @@ static struct board_info __initdata boar +@@ -1262,6 +1262,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1981,6 +2011,7 @@ static const struct board_info __initcon +@@ -1978,6 +2008,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2073,6 +2104,7 @@ static struct of_device_id const bcm963x +@@ -2068,6 +2099,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index 1992e0c6d4..930cbdfd98 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1962,6 +2005,7 @@ static const struct board_info __initcon +@@ -1960,6 +2003,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2050,6 +2094,7 @@ static struct of_device_id const bcm963x +@@ -2045,6 +2089,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 7eb52ae863..18421a9108 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -75,15 +75,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1999,6 +2067,7 @@ static const struct board_info __initcon +@@ -1997,6 +2065,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, + &board_dsl_2751b_d1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2092,6 +2161,7 @@ static struct of_device_id const bcm963x +@@ -2087,6 +2156,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index 936aab115b..ffb1e2d863 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar +@@ -1708,6 +1708,30 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2141,6 +2165,7 @@ static const struct board_info __initcon +@@ -2136,6 +2160,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2243,6 +2268,7 @@ static struct of_device_id const bcm963x +@@ -2238,6 +2263,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index 267143cf94..0da3634a21 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1375,6 +1375,31 @@ static struct board_info __initdata boar +@@ -1373,6 +1373,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2148,6 +2173,7 @@ static const struct board_info __initcon +@@ -2145,6 +2170,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2257,6 +2283,7 @@ static struct of_device_id const bcm963x +@@ -2252,6 +2278,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index d1b865134a..f89c19233e 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar +@@ -1757,6 +1757,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2192,6 +2238,7 @@ static const struct board_info __initcon +@@ -2187,6 +2233,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2295,6 +2342,7 @@ static struct of_device_id const bcm963x +@@ -2290,6 +2337,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index 59f57bc8dc..4a74960e5d 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -46,15 +46,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2163,6 +2202,7 @@ static const struct board_info __initcon +@@ -2161,6 +2200,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, + &board_FAST2704N, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2260,6 +2300,7 @@ static struct of_device_id const bcm963x +@@ -2255,6 +2295,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 1455b748ce..607e49d957 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1992,6 +1992,59 @@ static struct board_info __initdata boar +@@ -1990,6 +1990,59 @@ static struct board_info __initdata boar }, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2282,6 +2335,7 @@ static const struct board_info __initcon +@@ -2277,6 +2330,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, + &board_VR3026e, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2382,6 +2436,7 @@ static struct of_device_id const bcm963x +@@ -2377,6 +2431,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index 8c9cc3944f..24b12f7ad7 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -51,15 +51,15 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2266,6 +2310,7 @@ static const struct board_info __initcon +@@ -2264,6 +2308,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, + &board_R5010UNV2, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2364,6 +2409,7 @@ static struct of_device_id const bcm963x +@@ -2359,6 +2404,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index 31c83972cc..9ff6a10397 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar +@@ -1886,6 +1886,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2376,6 +2422,7 @@ static const struct board_info __initcon +@@ -2371,6 +2417,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2484,6 +2531,7 @@ static struct of_device_id const bcm963x +@@ -2479,6 +2526,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 6981b2ae16..1eac718426 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar +@@ -1840,6 +1840,42 @@ static struct board_info __initdata boar }, }; @@ -43,7 +43,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2422,6 +2458,7 @@ static const struct board_info __initcon +@@ -2417,6 +2453,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -51,7 +51,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2534,6 +2571,7 @@ static struct of_device_id const bcm963x +@@ -2529,6 +2566,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index fbf58fe33a..2722b9ef4e 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar +@@ -1730,6 +1730,51 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -52,15 +52,15 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2455,6 +2500,7 @@ static const struct board_info __initcon - #endif - +@@ -2450,6 +2495,7 @@ static const struct board_info __initcon + &board_fast2504n, + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 + &board_AV4202N, &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2562,6 +2608,7 @@ static struct of_device_id const bcm963x +@@ -2557,6 +2603,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index b89ac7fd49..8beea94da0 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar +@@ -2214,6 +2214,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2508,6 +2608,7 @@ static const struct board_info __initcon +@@ -2503,6 +2603,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2619,6 +2720,7 @@ static struct of_device_id const bcm963x +@@ -2614,6 +2715,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index 9c42c6ea84..ec7e4bacdc 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar +@@ -2064,6 +2064,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2608,6 +2631,7 @@ static const struct board_info __initcon +@@ -2603,6 +2626,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2709,6 +2733,7 @@ static struct of_device_id const bcm963x +@@ -2704,6 +2728,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index e7fe6f69ac..388b71aa9b 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -68,15 +68,15 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2548,6 +2609,7 @@ static const struct board_info __initcon +@@ -2546,6 +2607,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, + &board_AR5315u, &board_dsl_2751b_d1, &board_FAST2704N, - #endif -@@ -2653,6 +2715,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6318 */ +@@ -2648,6 +2710,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index b50954a156..a59571a096 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -74,15 +74,15 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2615,6 +2682,7 @@ static const struct board_info __initcon - #endif +@@ -2613,6 +2680,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AD1018, &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2729,6 +2797,8 @@ static struct of_device_id const bcm963x +@@ -2724,6 +2792,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 8bae6c378b..8ab891f370 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2664,6 +2664,49 @@ static struct board_info __initdata boar +@@ -2662,6 +2662,49 @@ static struct board_info __initdata boar }, }, }; @@ -50,15 +50,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2772,6 +2815,7 @@ static const struct board_info __initcon +@@ -2767,6 +2810,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, + &board_BSKYB_63168, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2885,6 +2929,7 @@ static struct of_device_id const bcm963x +@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 925b150415..4c7ed72862 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2618,6 +2618,44 @@ static struct board_info __initdata boar +@@ -2616,6 +2616,44 @@ static struct board_info __initdata boar }, }; @@ -45,15 +45,15 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2814,6 +2852,7 @@ static const struct board_info __initcon +@@ -2809,6 +2847,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, + &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, - #endif -@@ -2928,6 +2967,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_63268 */ +@@ -2923,6 +2962,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 2a39c733eb..e8f3044385 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1820,6 +1820,31 @@ static struct board_info __initdata boar +@@ -1818,6 +1818,31 @@ static struct board_info __initdata boar }, }; @@ -32,15 +32,15 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2830,6 +2855,7 @@ static const struct board_info __initcon - +@@ -2826,6 +2851,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_dgnd3700v2, &board_fast2504n, - #endif - -@@ -2945,6 +2971,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6362 */ + #ifdef CONFIG_BCM63XX_CPU_6368 +@@ -2940,6 +2966,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index 7d39125cee..af4baf4710 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2643,6 +2643,31 @@ static struct board_info __initdata boar +@@ -2641,6 +2641,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2878,6 +2903,7 @@ static const struct board_info __initcon +@@ -2873,6 +2898,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2994,6 +3020,7 @@ static struct of_device_id const bcm963x +@@ -2989,6 +3015,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index cbcd2ade96..cce5720322 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1879,6 +1879,37 @@ static struct board_info __initdata boar +@@ -1877,6 +1877,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,15 +38,15 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2882,6 +2913,7 @@ static const struct board_info __initcon +@@ -2878,6 +2909,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, + &board_hg253s_v2, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2997,6 +3029,7 @@ static struct of_device_id const bcm963x + &board_AV4202N, +@@ -2992,6 +3024,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index 3976527b37..c07b65b768 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2849,6 +2892,7 @@ static const struct board_info __initcon +@@ -2847,6 +2890,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2957,6 +3001,7 @@ static struct of_device_id const bcm963x +@@ -2952,6 +2996,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index eaa28a9778..8b48155d25 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2869,6 +2869,37 @@ static struct board_info __initdata boar +@@ -2867,6 +2867,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,15 +38,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2983,6 +3014,7 @@ static const struct board_info __initcon +@@ -2978,6 +3009,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, + &board_H500s, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3101,6 +3133,8 @@ static struct of_device_id const bcm963x +@@ -3096,6 +3128,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From 92727a122819a911c783841abec6d989c9560f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 6 Aug 2020 16:20:30 +0200 Subject: [PATCH 35/45] bcm63xx: switch to upstream CFE version detection patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch improving CFE version detection has been merged (linux 5.9). Signed-off-by: Álvaro Fernández Rojas --- ...CM63xx-improve-CFE-version-detection.patch | 56 +++++++++++++++++++ ...ister-OHCI-controller-if-board-enabl.patch | 2 +- ...ister-EHCI-controller-if-board-enabl.patch | 2 +- ...e-device-registration-code-into-its-.patch | 2 +- ...s-a-mac-addresss-allocator-to-board-.patch | 2 +- .../patches-5.4/309-cfe_version_mod.patch | 27 --------- ...-support-for-matching-the-board_info.patch | 2 +- 7 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch delete mode 100644 target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch diff --git a/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch new file mode 100644 index 0000000000..1daa3e6149 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch @@ -0,0 +1,56 @@ +From e27e1cc9d360a347dbd5a398e9df21cfb4e60e3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Mon, 8 Jun 2020 11:28:35 +0200 +Subject: [PATCH] MIPS: BCM63xx: improve CFE version detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are some CFE variants that start with 'cfe-vd' instead of 'cfe-v', such +as the one used in the Huawei HG556a: "cfe-vd081.5003". In this case, the CFE +version is stored as is (string vs number bytes). + +Some newer devices have an additional version number, such as the Comtrend +VR-3032u: "1.0.38-112.118-11". + +Finally, print the string as is if the version doesn't start with "cfe-v" or +"cfe-vd", but starts with "cfe-". + +Signed-off-by: Álvaro Fernández Rojas +Signed-off-by: Thomas Bogendoerfer +--- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -760,11 +760,25 @@ void __init board_prom_init(void) + + /* dump cfe version */ + cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; +- if (!memcmp(cfe, "cfe-v", 5)) +- snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", +- cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); +- else ++ if (strstarts(cfe, "cfe-")) { ++ if(cfe[4] == 'v') { ++ if(cfe[5] == 'd') ++ snprintf(cfe_version, 11, "%s", ++ (char *) &cfe[5]); ++ else if (cfe[10] > 0) ++ snprintf(cfe_version, sizeof(cfe_version), ++ "%u.%u.%u-%u.%u-%u", cfe[5], cfe[6], ++ cfe[7], cfe[8], cfe[9], cfe[10]); ++ else ++ snprintf(cfe_version, sizeof(cfe_version), ++ "%u.%u.%u-%u.%u", cfe[5], cfe[6], ++ cfe[7], cfe[8], cfe[9]); ++ } else { ++ snprintf(cfe_version, 12, "%s", (char *) &cfe[4]); ++ } ++ } else { + strcpy(cfe_version, "unknown"); ++ } + pr_info("CFE version: %s\n", cfe_version); + + bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET); diff --git a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch index 80427d7fd3..b2fbb68ee1 100644 --- a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include -@@ -878,6 +879,9 @@ int __init board_register_devices(void) +@@ -892,6 +893,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch index e8c2588b67..feb99a1cd7 100644 --- a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include #include -@@ -879,6 +880,9 @@ int __init board_register_devices(void) +@@ -893,6 +894,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index f39c9a8122..a53274a4ba 100644 --- a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski * early init callback, read nvram data from flash and checksum it */ void __init board_prom_init(void) -@@ -782,137 +724,15 @@ void __init board_prom_init(void) +@@ -796,137 +738,15 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ diff --git a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch index f34e222314..3cf3afd49d 100644 --- a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch +++ b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch @@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -724,7 +724,8 @@ void __init board_prom_init(void) +@@ -738,7 +738,8 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ diff --git a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch deleted file mode 100644 index 3a0d08074d..0000000000 --- a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -704,10 +704,20 @@ void __init board_prom_init(void) - - /* dump cfe version */ - cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; -- if (!memcmp(cfe, "cfe-v", 5)) -- snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", -- cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); -- else -+ if (strstarts(cfe, "cfe-")) { -+ if(cfe[4] == 'v') { -+ if(cfe[5] == 'd') -+ snprintf(cfe_version, 11, "%s", (char *) &cfe[5]); -+ else if (cfe[10] > 0) -+ snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u-%u", -+ cfe[5], cfe[6], cfe[7], cfe[8], cfe[9], cfe[10]); -+ else -+ snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", -+ cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); -+ } else { -+ snprintf(cfe_version, 12, "%s", (char *) &cfe[4]); -+ } -+ } else - strcpy(cfe_version, "unknown"); - pr_info("CFE version: %s\n", cfe_version); - diff --git a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch index db30de2183..ba7346ce28 100644 --- a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch +++ b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address -@@ -742,6 +747,16 @@ void __init board_bcm963xx_init(void) +@@ -746,6 +751,16 @@ void __init board_bcm963xx_init(void) } else { board_name = bcm63xx_nvram_get_name(); } From 7673df799496d98f1828152e1542af14f7708790 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 6 Aug 2020 23:48:32 +0200 Subject: [PATCH 36/45] ramips: switch rt3883 subtarget to kernel 5.4 The target has testing support for kernel 5.4 for quite a while, compiles fine for all devices, and has been run-tested on Asus RT-N56U successfully. Let's set it to kernel 5.4 by default to increase the audience before an 20.xx stable branch. Signed-off-by: Adrian Schmutzler Tested-by: Eneas U de Queiroz [Asus RT-N56U] --- target/linux/ramips/rt3883/target.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk index 9c719f8b76..4a032f5437 100644 --- a/target/linux/ramips/rt3883/target.mk +++ b/target/linux/ramips/rt3883/target.mk @@ -9,8 +9,6 @@ CPU_TYPE:=74kc DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini swconfig -KERNEL_PATCHVER:=4.14 - define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards. endef From 34271d38ae9087816219de0bf9ff5197483277e6 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Thu, 6 Aug 2020 22:10:32 +0200 Subject: [PATCH 37/45] tools/firmware-utils: use UTC for image timestamps By using localtime() to determine the timestamp that goes into factory images, the resulting image depends on the timezone of the build system. Use gmtime() instead, which results in more reproducible images. Signed-off-by: Sander Vanheule --- tools/firmware-utils/Makefile | 2 +- tools/firmware-utils/src/addpattern.c | 2 +- tools/firmware-utils/src/tplink-safeloader.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index ee0ef3a6fd..4fcda7e439 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME := firmware-utils -PKG_RELEASE := 1 +PKG_RELEASE := 2 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c index 9bc4865335..9791527878 100644 --- a/tools/firmware-utils/src/addpattern.c +++ b/tools/firmware-utils/src/addpattern.c @@ -296,7 +296,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - ptm = localtime(&t); + ptm = gmtime(&t); if (3 != sscanf(version, "v%d.%d.%d", &v0, &v1, &v2)) { fprintf(stderr, "bad version string \"%s\"\n", version); diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index a5f3ced16d..0af1fe4c6e 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -2079,7 +2079,7 @@ static struct image_partition_entry make_soft_version(uint32_t rev) { else if (time(&t) == (time_t)(-1)) error(1, errno, "time"); - struct tm *tm = localtime(&t); + struct tm *tm = gmtime(&t); s->magic = htonl(0x0000000c); s->zero = 0; From 064dc1e81bc85f6ef8becc38854292853a59d2c2 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 4 Aug 2020 12:00:22 +0800 Subject: [PATCH 38/45] dnsmasq: abort when dnssec requested but not available Before this commit, if uci option "dnssec" was set, we pass "--dnssec" and friends to dnsmasq, let it start and decide whether to quit and whether to emit message for diagnosis # dnsmasq --dnssec; echo $? dnsmasq: DNSSEC not available: set HAVE_DNSSEC in src/config.h 1 DNSSEC as a feature is different from others like dhcp, tftp in that it's a security feature. Better be explicit. With this change committed, we make it so by not allowing it in the first in the initscript, should dnsmasq later decides to not quit (not likely) or quit without above explicit error (unlikely but less so ;) So this is just being proactive. on/off choices with uci option "dnssec" are still available like before Link: https://github.com/openwrt/openwrt/pull/3265#issuecomment-667795302 Signed-off-by: Yousong Zhou --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 22ecd12f07..ab3f4fd8d0 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.82 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 9288971426..932103d8b5 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -42,9 +42,13 @@ dnsmasq_ignore_opt() { bootp-*|\ pxe-*) [ -z "$dnsmasq_has_dhcp" ] ;; - dnssec-*|\ + dnssec*|\ trust-anchor) - [ -z "$dnsmasq_has_dnssec" ] ;; + if [ -z "$dnsmasq_has_dnssec" ]; then + echo "dnsmasq: \"$opt\" requested, but dnssec support is not available" >&2 + exit 1 + fi + ;; tftp-*) [ -z "$dnsmasq_has_tftp" ] ;; ipset) From 81fdb4235e4e5efe7f0fde06b908a4f6ce6a96f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 09:14:15 +0200 Subject: [PATCH 39/45] bcm63xx: refactor board patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current board patches format is crazy. Let's try to put some order. Signed-off-by: Álvaro Fernández Rojas --- .../bcm63xx/patches-5.4/500-board-D4PW.patch | 16 +-- .../bcm63xx/patches-5.4/501-board-NB4.patch | 86 ++++++----- .../patches-5.4/502-board-96338W2_E7T.patch | 21 ++- .../patches-5.4/503-board-CPVA642.patch | 30 ++-- .../504-board_dsl_274xb_rev_c.patch | 26 ++-- .../patches-5.4/505-board_spw500v.patch | 32 ++--- .../patches-5.4/506-board_gw6200_gw6000.patch | 68 +++++---- .../bcm63xx/patches-5.4/507-board-MAGIC.patch | 38 ++--- .../bcm63xx/patches-5.4/508-board_hw553.patch | 43 +++--- .../patches-5.4/509-board_rta1320_16m.patch | 23 ++- .../patches-5.4/510-board_spw303v.patch | 20 +-- .../patches-5.4/511-board_V2500V.patch | 41 +++--- .../patches-5.4/512-board_BTV2110.patch | 24 ++-- ...BCM63XX-add-inventel-Livebox-support.patch | 36 +++-- .../patches-5.4/514-board_ct536_ct5621.patch | 42 +++--- .../patches-5.4/515-board_DWV-S0_fixes.patch | 2 +- .../patches-5.4/516-board_96348A-122.patch | 37 +++-- .../patches-5.4/517_board_CPVA502plus.patch | 43 +++--- ...63xx-add-support-for-96368MVWG-board.patch | 54 ++++--- ...3xx-add-support-for-96368MVNgr-board.patch | 50 +++---- ...CM63XX-add-96328avng-reference-board.patch | 27 ++-- ...CM63XX-add-963281TAN-reference-board.patch | 37 +++-- .../522-board_dsl_274xb_rev_f.patch | 49 ++++--- .../patches-5.4/523-board_96348w3.patch | 29 ++-- .../patches-5.4/524-board_CT6373-1.patch | 40 +++--- .../525-board_dva-g3810bn-tl-1.patch | 38 +++-- .../bcm63xx/patches-5.4/526-board_nb6.patch | 25 ++-- .../patches-5.4/527-board_fast2604.patch | 24 ++-- .../patches-5.4/528-board_A4001N1.patch | 56 ++++---- .../patches-5.4/529-board_AR-5387un.patch | 60 ++++---- .../patches-5.4/530-board_AR-5381u.patch | 56 ++++---- .../patches-5.4/531-board_rta770bw.patch | 21 ++- .../bcm63xx/patches-5.4/532-board_hw556.patch | 136 +++++++++--------- .../patches-5.4/533-board_rta770w.patch | 23 ++- .../patches-5.4/534-board_fast2704.patch | 43 +++--- .../patches-5.4/535-board_fast2504n.patch | 40 +++--- .../patches-5.4/536-board_96318ref.patch | 49 +++---- .../patches-5.4/537-board_96318ref_p300.patch | 49 +++---- .../patches-5.4/538-board_bcm963269bhr.patch | 45 +++--- .../patches-5.4/539-board_AR1004G.patch | 26 ++-- .../patches-5.4/540-board_vw6339gu.patch | 53 ++++--- .../patches-5.4/541-board_963268gu_p300.patch | 71 +++++---- .../patches-5.4/542-board_WAP-5813n.patch | 34 ++--- .../patches-5.4/543-board_VR-3025u.patch | 56 ++++---- .../patches-5.4/544-board_VR-3025un.patch | 54 +++---- .../patches-5.4/545-board_P870HW-51a_v2.patch | 54 +++---- .../bcm63xx/patches-5.4/546-board_hw520.patch | 44 +++--- .../patches-5.4/547-board_A4001N.patch | 56 ++++---- .../patches-5.4/548-board_dsl-2751b_e1.patch | 56 ++++---- .../549-board_DGND3700v1_3800B.patch | 28 ++-- .../patches-5.4/550-board_homehub2a.patch | 40 +++--- .../patches-5.4/551-board_HG655b.patch | 54 +++---- .../patches-5.4/552-board_fast2704n.patch | 49 ++++--- .../patches-5.4/553-board_VR-3026e.patch | 54 +++---- .../patches-5.4/554-board_R5010UNv2.patch | 52 +++---- .../bcm63xx/patches-5.4/555-board_HG622.patch | 54 +++---- .../patches-5.4/556-board_EVG2000.patch | 37 ++--- .../patches-5.4/557-board_AV4202N.patch | 61 ++++---- .../patches-5.4/558-board_VH4032N.patch | 48 +++---- .../patches-5.4/559-board_R1000H.patch | 28 ++-- .../patches-5.4/560-board_AR-5315u.patch | 56 ++++---- .../patches-5.4/561-board_AD1018.patch | 58 ++++---- .../bcm63xx/patches-5.4/562-board_sr102.patch | 51 +++---- .../patches-5.4/563-board-VR-3032u.patch | 49 +++---- .../patches-5.4/564-board-DGND3700v2.patch | 31 ++-- .../patches-5.4/565-board-VG-8050.patch | 22 +-- .../patches-5.4/566-board-HG253s-v2.patch | 10 +- ...67-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 56 ++++---- .../bcm63xx/patches-5.4/568-board-H500s.patch | 23 ++- 69 files changed, 1431 insertions(+), 1513 deletions(-) diff --git a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch index cad12be975..74e61cc794 100644 --- a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch @@ -6,17 +6,17 @@ }; + +static struct board_info __initdata board_96348_D4PW = { -+ .name = "D-4P-W", -+ .expected_cpu_id = 0x6348, ++ .name = "D-4P-W", ++ .expected_cpu_id = 0x6348, + -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pci = 1, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6348 */ diff --git a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch index 19bf51a160..224895a0f4 100644 --- a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch @@ -1,67 +1,63 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -416,6 +416,60 @@ static struct board_info __initdata boar +@@ -416,6 +416,56 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; + +static struct board_info __initdata board_nb4_ser_r0 = { -+ .name = "NB4-SER-r0", -+ .expected_cpu_id = 0x6358, ++ .name = "NB4-SER-r0", ++ .expected_cpu_id = 0x6358, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ -+ .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, -+ }, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+ -+ -+ .has_ohci0 = 1, + .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .num_usbh_ports = 2, ++ ++ .has_enet0 = 1, ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, +}; + +static struct board_info __initdata board_nb4_fxc_r1 = { -+ .name = "NB4-FXC-r1", -+ .expected_cpu_id = 0x6358, ++ .name = "NB4-FXC-r1", ++ .expected_cpu_id = 0x6358, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ -+ .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, -+ }, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+ -+ -+ .has_ohci0 = 1, + .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .num_usbh_ports = 2, ++ ++ .has_enet0 = 1, ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, +}; #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -451,6 +505,8 @@ static const struct board_info __initcon +@@ -451,6 +501,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -70,7 +66,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -492,6 +548,8 @@ static struct of_device_id const bcm963x +@@ -492,6 +544,8 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, diff --git a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch index 8f81f7d4f9..c8bafc3eec 100644 --- a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch +++ b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch @@ -1,27 +1,26 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -98,6 +98,20 @@ static struct board_info __initdata boar +@@ -98,6 +98,19 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; + +static struct board_info __initdata board_96338w2_e7t = { -+ .name = "96338W2_E7T", -+ .expected_cpu_id = 0x6338, -+ -+ .has_enet0 = 1, ++ .name = "96338W2_E7T", ++ .expected_cpu_id = 0x6338, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -485,6 +499,7 @@ static const struct board_info __initcon +@@ -481,6 +494,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, @@ -29,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -521,6 +536,7 @@ static struct of_device_id const bcm963x +@@ -517,6 +531,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch index c85702fa84..3ab1813ca6 100644 --- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch @@ -1,32 +1,30 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -383,6 +383,25 @@ static struct board_info __initdata boar +@@ -382,6 +382,23 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; +static struct board_info __initdata board_CPVA642 = { -+ .name = "CPVA642", -+ .expected_cpu_id = 0x6358, -+ -+ .has_enet1 = 1, -+ .has_pci = 1, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, ++ .name = "CPVA642", ++ .expected_cpu_id = 0x6358, + ++ .has_pci = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, -+}; + ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++}; + static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -519,6 +538,7 @@ static const struct board_info __initcon +@@ -514,6 +531,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -34,7 +32,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -566,6 +586,7 @@ static struct of_device_id const bcm963x +@@ -561,6 +579,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch index f4df4443d5..bc1791b214 100644 --- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch @@ -1,29 +1,29 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -450,6 +450,22 @@ static struct board_info __initdata boar +@@ -447,6 +447,22 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; +/* D-Link DSL-274xB revison C2/C3 */ +static struct board_info __initdata board_dsl_274xb_rev_c = { -+ .name = "AW4139", -+ .expected_cpu_id = 0x6358, ++ .name = "AW4139", ++ .expected_cpu_id = 0x6358, + -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pci = 1, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; + static struct board_info __initdata board_nb4_ser_r0 = { - .name = "NB4-SER-r0", - .expected_cpu_id = 0x6358, -@@ -540,6 +556,7 @@ static const struct board_info __initcon + .name = "NB4-SER-r0", + .expected_cpu_id = 0x6358, +@@ -533,6 +549,7 @@ static const struct board_info __initcon &board_AGPFS0, &board_CPVA642, &board_DWVS0, @@ -31,7 +31,7 @@ &board_nb4_ser_r0, &board_nb4_fxc_r1, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -579,6 +596,7 @@ static struct of_device_id const bcm963x +@@ -572,6 +589,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch index 837a6ff659..61bc61a9c7 100644 --- a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -323,6 +323,36 @@ static struct board_info __initdata boar - .force_duplex_full = 1, +@@ -322,6 +322,36 @@ static struct board_info __initdata boar + .force_duplex_full = 1, }, }; + @@ -14,30 +14,30 @@ +}; + +static struct board_info __initdata board_spw500v = { -+ .name = "SPW500V", -+ .expected_cpu_id = 0x6348, ++ .name = "SPW500V", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 1, -+ .has_pci = 1, -+ .use_fallback_sprom = 1, ++ .has_pci = 1, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = spw500v_fixups, -+ .num_board_fixups = ARRAY_SIZE(spw500v_fixups), ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = spw500v_fixups, ++ .num_board_fixups = ARRAY_SIZE(spw500v_fixups), + }, +}; #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -549,6 +579,7 @@ static const struct board_info __initcon +@@ -542,6 +572,7 @@ static const struct board_info __initcon &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -589,6 +620,7 @@ static struct of_device_id const bcm963x +@@ -582,6 +613,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch index 5bef9b4d27..e8ba68959b 100644 --- a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch @@ -1,55 +1,53 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -217,6 +217,48 @@ static struct board_info __initdata boar +@@ -216,6 +216,46 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; +static struct board_info __initdata board_gw6200 = { -+ .name = "GW6200", -+ .expected_cpu_id = 0x6348, -+ -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ -+ .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, -+ }, -+ .enet1 = { -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, ++ .name = "GW6200", ++ .expected_cpu_id = 0x6348, + ++ .has_pci = 1, + .has_ohci0 = 1, ++ ++ .has_enet0 = 1, ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, +}; + +static struct board_info __initdata board_gw6000 = { -+ .name = "GW6000", -+ .expected_cpu_id = 0x6348, -+ -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ -+ .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, -+ }, -+ .enet1 = { -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, ++ .name = "GW6000", ++ .expected_cpu_id = 0x6348, + ++ .has_pci = 1, + .has_ohci0 = 1, ++ ++ .has_enet0 = 1, ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, +}; -+ -+ + static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -572,6 +614,8 @@ static const struct board_info __initcon +@@ -565,6 +605,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -58,7 +56,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -621,6 +665,8 @@ static struct of_device_id const bcm963x +@@ -614,6 +656,8 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, diff --git a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch index 4d20a18fac..536e033928 100644 --- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch @@ -1,38 +1,38 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -395,6 +395,31 @@ static struct board_info __initdata boar - .num_board_fixups = ARRAY_SIZE(spw500v_fixups), +@@ -392,6 +392,31 @@ static struct board_info __initdata boar + .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; + +static struct board_info __initdata board_96348sv = { -+ .name = "MAGIC", -+ .expected_cpu_id = 0x6348, ++ .name = "MAGIC", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, ++ ++ .has_enet1 = 1, + .enet1 = { + /* it has BP_ENET_EXTERNAL_PHY */ -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, -+ -+ .has_ohci0 = 1, -+ .has_pccard = 1, -+ .has_ehci0 = 1, +}; #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -624,6 +649,7 @@ static const struct board_info __initcon +@@ -615,6 +640,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, @@ -40,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -667,6 +693,7 @@ static struct of_device_id const bcm963x +@@ -658,6 +684,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch index 4983bc2676..841ee7f2be 100644 --- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch @@ -1,39 +1,38 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -616,6 +616,32 @@ static struct board_info __initdata boar - .has_ehci0 = 1, - .num_usbh_ports = 2, +@@ -607,6 +607,31 @@ static struct board_info __initdata boar + .force_duplex_full = 1, + }, }; + +static struct board_info __initdata board_HW553 = { -+ .name = "HW553", -+ .expected_cpu_id = 0x6358, -+ -+ .has_enet1 = 1, -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, ++ .name = "HW553", ++ .expected_cpu_id = 0x6358, + ++ .has_pci = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .num_usbh_ports = 2, + ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++ ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -660,6 +686,7 @@ static const struct board_info __initcon +@@ -651,6 +676,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -41,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -703,6 +730,7 @@ static struct of_device_id const bcm963x +@@ -694,6 +720,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch index fdfe686ebe..8e48b736db 100644 --- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch +++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch @@ -1,27 +1,26 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -112,6 +112,20 @@ static struct board_info __initdata boar - .force_duplex_full = 1, +@@ -111,6 +111,19 @@ static struct board_info __initdata boar + .force_duplex_full = 1, }, }; + +static struct board_info __initdata board_rta1320_16m = { -+ .name = "RTA1320_16M", -+ .expected_cpu_id = 0x6338, -+ -+ .has_enet0 = 1, ++ .name = "RTA1320_16M", ++ .expected_cpu_id = 0x6338, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -658,6 +672,7 @@ static const struct board_info __initcon +@@ -648,6 +661,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, @@ -29,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -701,6 +716,7 @@ static struct of_device_id const bcm963x +@@ -691,6 +705,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch index 2ab72d47d1..4df643a721 100644 --- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch @@ -1,27 +1,27 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -656,6 +656,20 @@ static struct board_info __initdata boar - .pci_dev = 1, +@@ -645,6 +645,20 @@ static struct board_info __initdata boar + .pci_dev = 1, }, }; + + /* T-Home Speedport W 303V Typ B */ +static struct board_info __initdata board_spw303v = { -+ .name = "96358-502V", -+ .expected_cpu_id = 0x6358, ++ .name = "96358-502V", ++ .expected_cpu_id = 0x6358, + -+ .has_enet0 = 1, -+ .has_pci = 1, ++ .has_pci = 1, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -702,6 +716,7 @@ static const struct board_info __initcon +@@ -691,6 +705,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, @@ -29,7 +29,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -753,6 +768,7 @@ static struct of_device_id const bcm963x +@@ -742,6 +757,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index e7082ded75..d7526c9fdf 100644 --- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -1,33 +1,34 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -434,6 +434,26 @@ static struct board_info __initdata boar - .has_pccard = 1, - .has_ehci0 = 1, +@@ -430,6 +430,27 @@ static struct board_info __initdata boar + .force_duplex_full = 1, + }, }; + +static struct board_info __initdata board_V2500V_BB = { -+ .name = "V2500V_BB", -+ .expected_cpu_id = 0x6348, ++ .name = "V2500V_BB", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pci = 1, + -+ .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, -+ }, -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_enet0 = 1, ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -705,6 +725,7 @@ static const struct board_info __initcon +@@ -694,6 +715,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, @@ -35,7 +36,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -743,6 +764,7 @@ static struct of_device_id const bcm963x +@@ -732,6 +754,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -43,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -802,6 +824,22 @@ void __init board_bcm963xx_init(void) +@@ -791,6 +814,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch index 0259432f96..1ae504cae9 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch @@ -1,31 +1,29 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -208,6 +208,24 @@ static struct board_info __initdata boar +@@ -206,6 +206,22 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; -+ +/* BT Voyager 2110 */ +static struct board_info __initdata board_V2110 = { -+ .name = "V2110", -+ .expected_cpu_id = 0x6348, ++ .name = "V2110", ++ .expected_cpu_id = 0x6348, + -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pci = 1, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; -+ + static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -726,6 +744,7 @@ static const struct board_info __initcon +@@ -716,6 +732,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, @@ -33,7 +31,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -764,6 +783,7 @@ static struct of_device_id const bcm963x +@@ -754,6 +771,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 24815782d1..0035cee7e9 100644 --- a/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -58,10 +58,10 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support #endif /* __BOARD_COMMON_H */ --- /dev/null +++ b/arch/mips/bcm63xx/boards/board_livebox.c -@@ -0,0 +1,155 @@ +@@ -0,0 +1,153 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive ++ * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2008 Florian Fainelli @@ -90,28 +90,26 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support + */ +#ifdef CONFIG_BCM63XX_CPU_6348 +static struct board_info __initdata board_livebox_blue5g = { -+ .name = "Livebox-blue-5g", -+ .expected_cpu_id = 0x6348, ++ .name = "Livebox-blue-5g", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .ephy_reset_gpio = 6, ++ .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 31, ++ .has_phy = 1, ++ .phy_id = 31, + }, -+ -+ .ephy_reset_gpio = 6, -+ .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, -+ -+ .has_ohci0 = 1, -+ .has_pccard = 1, +}; +#endif + @@ -121,7 +119,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support +static const struct board_info __initdata *bcm963xx_boards[] = { +#ifdef CONFIG_BCM63XX_CPU_6348 + &board_livebox_blue5g -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6348 */ +}; + +static struct of_device_id const livebox_boards_dt[] = { @@ -155,7 +153,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support + printk(KERN_ERR PFX "unable to fetch mac address\n"); + return -ENODEV; + } -+ mac_addr_used++; ++ mac_addr_used++; + + return 0; +} diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch index 4f8d33ff07..b2ad8f22f6 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch @@ -1,40 +1,38 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -226,6 +226,33 @@ static struct board_info __initdata boar +@@ -222,6 +222,31 @@ static struct board_info __initdata boar + }, }; - +static struct board_info __initdata board_ct536_ct5621 = { -+ .name = "CT536_CT5621", -+ .expected_cpu_id = 0x6348, ++ .name = "CT536_CT5621", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 0, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+ -+ .has_ohci0 = 1, + .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, + ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++ ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -745,6 +772,7 @@ static const struct board_info __initcon +@@ -733,6 +758,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, @@ -42,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -785,6 +813,8 @@ static struct of_device_id const bcm963x +@@ -773,6 +799,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch index 35e93b1aa2..9ae70ea84e 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch +++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -624,6 +624,7 @@ static struct board_info __initdata boar +@@ -615,6 +615,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch index 0843a99c41..99c224e5ac 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch @@ -1,37 +1,36 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -253,6 +253,30 @@ static struct board_info __initdata boar +@@ -247,6 +247,29 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_96348A_122 = { -+ .name = "96348A-122", -+ .expected_cpu_id = 0x6348, -+ -+ .has_enet1 = 1, -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, ++ .name = "96348A-122", ++ .expected_cpu_id = 0x6348, + ++ .has_pci = 1, + .has_ohci0 = 1, + ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++ ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -774,6 +798,7 @@ static const struct board_info __initcon +@@ -760,6 +783,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, @@ -39,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -815,6 +840,7 @@ static struct of_device_id const bcm963x +@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, diff --git a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch index a210ebb690..f5427713b7 100644 --- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch @@ -1,40 +1,41 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -225,6 +225,33 @@ static struct board_info __initdata boar +@@ -222,6 +222,34 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_CPVA502plus = { -+ .name = "CPVA502+", -+ .expected_cpu_id = 0x6348, ++ .name = "CPVA502+", ++ .expected_cpu_id = 0x6348, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, -+ .use_fallback_sprom = 1, ++ .has_pci = 1, ++ .ephy_reset_gpio = 4, ++ .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, ++ ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, ++ .has_phy = 1, ++ .phy_id = 0, + }, + -+ .ephy_reset_gpio = 4, -+ .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, -+ ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; - ++ static struct board_info __initdata board_ct536_ct5621 = { - .name = "CT536_CT5621", -@@ -799,6 +826,7 @@ static const struct board_info __initcon + .name = "CT536_CT5621", + .expected_cpu_id = 0x6348, +@@ -784,6 +812,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, @@ -42,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -850,6 +878,7 @@ static struct of_device_id const bcm963x +@@ -835,6 +864,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch index c33b493556..0fd5ce5758 100644 --- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -790,6 +790,58 @@ static struct board_info __initdata boar +@@ -776,6 +776,52 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -18,50 +18,44 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. + */ +#ifdef CONFIG_BCM63XX_CPU_6368 +static struct board_info __initdata board_96368mvwg = { -+ .name = "96368MVWG", -+ .expected_cpu_id = 0x6368, ++ .name = "96368MVWG", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ -+ .has_usbd = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + ++ .has_usbd = 1, + .usbd = { -+ .use_fullspeed = 0, -+ .port_no = 0, ++ .use_fullspeed = 0, ++ .port_no = 0, + }, + -+ .has_enetsw = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port1", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port2", + }, -+ + [4] = { -+ .used = 1, -+ .phy_id = 0x12, -+ .name = "port0", ++ .used = 1, ++ .phy_id = 0x12, ++ .name = "port0", + }, -+ + [5] = { -+ .used = 1, -+ .phy_id = 0x11, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 0x11, ++ .name = "port3", + }, + }, + }, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, +}; +#endif /* CONFIG_BCM63XX_CPU_6368 */ + @@ -69,7 +63,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -840,6 +892,9 @@ static const struct board_info __initcon +@@ -826,6 +872,9 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -79,7 +73,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -900,6 +955,7 @@ static struct of_device_id const bcm963x +@@ -886,6 +935,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch index 5839209a4e..2502c1252f 100644 --- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -9,53 +9,49 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -839,6 +839,45 @@ static struct board_info __initdata boar - .has_ohci0 = 1, - .has_ehci0 = 1, +@@ -819,6 +819,41 @@ static struct board_info __initdata boar + }, + }, }; + +static struct board_info __initdata board_96368mvngr = { -+ .name = "96368MVNgr", -+ .expected_cpu_id = 0x6368, ++ .name = "96368MVNgr", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, +}; #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -894,6 +933,7 @@ static const struct board_info __initcon +@@ -874,6 +909,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, @@ -63,7 +59,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ }; -@@ -955,6 +995,7 @@ static struct of_device_id const bcm963x +@@ -935,6 +971,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch index e482b20931..6c2c5aa2c9 100644 --- a/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch @@ -9,34 +9,33 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -64,6 +64,33 @@ static struct board_info __initdata boar +@@ -64,6 +64,32 @@ static struct board_info __initdata boar .use_fullspeed = 0, .port_no = 0, }, + -+ .has_enetsw = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 0518053070..c3f460806e 100644 --- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -9,40 +9,39 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -92,6 +92,40 @@ static struct board_info __initdata boar +@@ -91,6 +91,39 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_963281TAN = { -+ .name = "963281TAN", -+ .expected_cpu_id = 0x6328, ++ .name = "963281TAN", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ -+ .has_enetsw = 1, ++ .has_pci = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, @@ -50,7 +49,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -916,6 +950,7 @@ static const struct board_info __initcon +@@ -891,6 +924,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -58,7 +57,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -970,6 +1005,7 @@ static struct of_device_id const bcm963x +@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch index ad3e689802..f982660efd 100644 --- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch @@ -10,51 +10,50 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -126,6 +126,51 @@ static struct board_info __initdata boar +@@ -124,6 +124,50 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_dsl_274xb_f1 = { -+ .name = "AW4339U", -+ .expected_cpu_id = 0x6328, ++ .name = "AW4339U", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, ++ .has_pci = 1, + -+ .has_caldata = 1, ++ .has_caldata = 1, + .caldata = { + { -+ .vendor = PCI_VENDOR_ID_ATHEROS, -+ .caldata_offset = 0x7d1000, -+ .slot = 0, -+ .led_pin = -1, -+ .led_active_high = 1, ++ .vendor = PCI_VENDOR_ID_ATHEROS, ++ .caldata_offset = 0x7d1000, ++ .slot = 0, ++ .led_pin = -1, ++ .led_active_high = 1, + }, + }, + -+ .has_enetsw = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 4", ++ .name = "Port 4", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 3", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 2", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 1", + }, + }, + }, @@ -62,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -951,6 +996,7 @@ static const struct board_info __initcon +@@ -925,6 +969,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -70,7 +69,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1007,6 +1053,7 @@ static struct of_device_id const bcm963x +@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch index 06bbd5d0fe..913f12f8d6 100644 --- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch @@ -1,31 +1,30 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -567,6 +567,24 @@ static struct board_info __initdata boar +@@ -556,6 +556,23 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; +/* NetGear DG834G v4 */ +static struct board_info __initdata board_96348W3 = { -+ .name = "96348W3", -+ .expected_cpu_id = 0x6348, ++ .name = "96348W3", ++ .expected_cpu_id = 0x6348, + -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, -+ -+ .has_ohci0 = 1, +}; + static struct board_info __initdata board_96348_D4PW = { - .name = "D-4P-W", - .expected_cpu_id = 0x6348, -@@ -1026,6 +1044,7 @@ static const struct board_info __initcon + .name = "D-4P-W", + .expected_cpu_id = 0x6348, +@@ -999,6 +1016,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, @@ -33,7 +32,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1079,6 +1098,7 @@ static struct of_device_id const bcm963x +@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch index 4a8be4c4d6..ea5035b4a0 100644 --- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch @@ -1,37 +1,37 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -872,6 +872,30 @@ static struct board_info __initdata boar - .num_usbh_ports = 2, +@@ -855,6 +855,30 @@ static struct board_info __initdata boar + }, }; +static struct board_info __initdata board_ct6373_1 = { -+ .name = "CT6373-1", -+ .expected_cpu_id = 0x6358, ++ .name = "CT6373-1", ++ .expected_cpu_id = 0x6358, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_HW553 = { - .name = "HW553", - .expected_cpu_id = 0x6358, -@@ -1055,6 +1079,7 @@ static const struct board_info __initcon + .name = "HW553", + .expected_cpu_id = 0x6358, +@@ -1027,6 +1051,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -39,7 +39,7 @@ &board_HW553, &board_spw303v, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1112,6 +1137,7 @@ static struct of_device_id const bcm963x +@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch index 5c356cfe04..9cfd82d7ee 100644 --- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch @@ -1,40 +1,38 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -935,6 +935,33 @@ static struct board_info __initdata boar - .use_internal_phy = 1, +@@ -917,6 +917,31 @@ static struct board_info __initdata boar + .use_internal_phy = 1, }, }; + +/* D-Link DVA-G3810BN/TL */ +static struct board_info __initdata board_DVAG3810BN = { -+ .name = "DVAG3810BN", -+ .expected_cpu_id = 0x6358, ++ .name = "DVAG3810BN", ++ .expected_cpu_id = 0x6358, + -+ .has_enet0 = 1, -+ .has_enet1 = 1, -+ .has_pci = 1, ++ .has_pccard = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, + ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, -+ -+ -+ .has_ohci0 = 1, -+ .has_pccard = 1, -+ .has_ehci0 = 1, +}; #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1082,6 +1109,7 @@ static const struct board_info __initcon +@@ -1054,6 +1079,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -42,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1140,6 +1168,7 @@ static struct of_device_id const bcm963x +@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch index 888bc7fc5a..fd7ab626f7 100644 --- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch @@ -1,29 +1,28 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -964,6 +964,32 @@ static struct board_info __initdata boar +@@ -944,6 +944,31 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6362 +static struct board_info __initdata board_nb6 = { -+ .name = "NB6", -+ .expected_cpu_id = 0x6362, ++ .name = "NB6", ++ .expected_cpu_id = 0x6362, + -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, -+ -+ .has_enetsw = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [4] = { -+ .used = 1, -+ .phy_id = 0xff, ++ .used = 1, ++ .phy_id = 0xff, + .bypass_link = 1, + .force_speed = 1000, + .force_duplex_full = 1, -+ .name = "RGMII", ++ .name = "RGMII", + }, + }, + }, @@ -33,7 +32,7 @@ /* * known 6368 boards */ -@@ -1111,6 +1137,9 @@ static const struct board_info __initcon +@@ -1081,6 +1106,9 @@ static const struct board_info __initcon &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -43,7 +42,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1179,6 +1208,9 @@ static struct of_device_id const bcm963x +@@ -1149,6 +1177,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch index bebdd8be14..924f1f6cac 100644 --- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch @@ -1,29 +1,29 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -501,6 +501,22 @@ static struct board_info __initdata boar +@@ -490,6 +490,22 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; +static struct board_info __initdata board_FAST2604 = { -+ .name = "F@ST2604", -+ .expected_cpu_id = 0x6348, ++ .name = "F@ST2604", ++ .expected_cpu_id = 0x6348, + -+ .has_pci = 1, -+ .has_ohci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; + static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1110,6 +1126,7 @@ static const struct board_info __initcon +@@ -1079,6 +1095,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1182,6 +1199,7 @@ static struct of_device_id const bcm963x +@@ -1151,6 +1168,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch index dd13df4920..32164c6cfa 100644 --- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch @@ -1,56 +1,56 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -127,6 +127,49 @@ static struct board_info __initdata boar +@@ -125,6 +125,49 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_A4001N1 = { -+ .name = "963281T_TEF", -+ .expected_cpu_id = 0x6328, ++ .name = "963281T_TEF", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43225, -+ .pci_bus = 1, -+ .pci_dev = 0, ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, + }, +}; + static struct board_info __initdata board_dsl_274xb_f1 = { - .name = "AW4339U", - .expected_cpu_id = 0x6328, -@@ -1107,6 +1150,7 @@ static const struct board_info __initcon + .name = "AW4339U", + .expected_cpu_id = 0x6328, +@@ -1076,6 +1119,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -58,7 +58,7 @@ &board_dsl_274xb_f1, #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1169,6 +1213,7 @@ static struct of_device_id const bcm963x +@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch index d3088c5847..037d42fbc5 100644 --- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -93,6 +93,78 @@ static struct board_info __initdata boar +@@ -92,6 +92,78 @@ static struct board_info __initdata boar }, }; @@ -32,54 +32,54 @@ +}; + +static struct board_info __initdata board_AR5387un = { -+ .name = "96328A-1441N1", -+ .expected_cpu_id = 0x6328, ++ .name = "96328A-1441N1", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43225, -+ .pci_bus = 1, -+ .pci_dev = 0, -+ .board_fixups = ar5387un_fixups, -+ .num_board_fixups = ARRAY_SIZE(ar5387un_fixups), ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ .board_fixups = ar5387un_fixups, ++ .num_board_fixups = ARRAY_SIZE(ar5387un_fixups), + }, +}; + static struct board_info __initdata board_963281TAN = { - .name = "963281TAN", - .expected_cpu_id = 0x6328, -@@ -1149,6 +1221,7 @@ static const struct board_info __initcon + .name = "963281TAN", + .expected_cpu_id = 0x6328, +@@ -1118,6 +1190,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -87,7 +87,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1216,6 +1289,7 @@ static struct of_device_id const bcm963x +@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch index 1842471033..0ede51519b 100644 --- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -93,6 +93,60 @@ static struct board_info __initdata boar +@@ -92,6 +92,60 @@ static struct board_info __initdata boar }, }; @@ -14,54 +14,54 @@ +}; + +static struct board_info __initdata board_AR5381u = { -+ .name = "96328A-1241N", -+ .expected_cpu_id = 0x6328, ++ .name = "96328A-1241N", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43225, -+ .pci_bus = 1, -+ .pci_dev = 0, -+ .board_fixups = ar5381u_fixups, -+ .num_board_fixups = ARRAY_SIZE(ar5381u_fixups), ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ .board_fixups = ar5381u_fixups, ++ .num_board_fixups = ARRAY_SIZE(ar5381u_fixups), + }, +}; + static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1221,6 +1275,7 @@ static const struct board_info __initcon +@@ -1190,6 +1244,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -69,7 +69,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1289,6 +1344,7 @@ static struct of_device_id const bcm963x +@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch index 31e2192e0d..0aa94fb32f 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch @@ -1,27 +1,26 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -411,6 +411,20 @@ static struct board_info __initdata boar +@@ -406,6 +406,19 @@ static struct board_info __initdata boar .name = "96345GW2", .expected_cpu_id = 0x6345, }; + +static struct board_info __initdata board_rta770bw = { -+ .name = "RTA770BW", -+ .expected_cpu_id = 0x6345, -+ -+ .has_enet0 = 1, ++ .name = "RTA770BW", ++ .expected_cpu_id = 0x6345, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1289,6 +1303,7 @@ static const struct board_info __initcon +@@ -1258,6 +1271,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -29,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1356,6 +1371,7 @@ static struct of_device_id const bcm963x +@@ -1325,6 +1339,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch index f9ca476ed4..f03de16982 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -8,100 +8,102 @@ #include #include #include -@@ -1121,6 +1122,92 @@ static struct board_info __initdata boar +@@ -1102,6 +1103,94 @@ static struct board_info __initdata boar }, }; -+static struct board_info __initdata board_HW556_C = { -+ .name = "HW556_C", -+ .expected_cpu_id = 0x6358, -+ -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, -+ -+ .has_caldata = 1, -+ .caldata = { -+ { -+ .vendor = PCI_VENDOR_ID_RALINK, -+ .caldata_offset = 0xeffe00, -+ .slot = 1, -+ .eeprom = "rt2x00.eeprom", -+ }, -+ }, -+ -+ .has_enet1 = 1, -+ .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+}; +static struct board_info __initdata board_HW556_A = { -+ .name = "HW556_A", -+ .expected_cpu_id = 0x6358, ++ .name = "HW556_A", ++ .expected_cpu_id = 0x6358, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_caldata = 1, ++ .has_caldata = 1, + .caldata = { + { -+ .vendor = PCI_VENDOR_ID_ATHEROS, -+ .caldata_offset = 0xf7e000, -+ .slot = 1, -+ .endian_check = 1, -+ .led_pin = 2, -+ .led_active_high = 1, ++ .vendor = PCI_VENDOR_ID_ATHEROS, ++ .caldata_offset = 0xf7e000, ++ .slot = 1, ++ .endian_check = 1, ++ .led_pin = 2, ++ .led_active_high = 1, + }, + }, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; ++ +static struct board_info __initdata board_HW556_B = { -+ .name = "HW556_B", -+ .expected_cpu_id = 0x6358, ++ .name = "HW556_B", ++ .expected_cpu_id = 0x6358, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_caldata = 1, ++ .has_caldata = 1, + .caldata = { + { -+ .vendor = PCI_VENDOR_ID_ATHEROS, -+ .caldata_offset = 0xefe000, -+ .slot = 1, -+ .endian_check = 1, -+ .led_pin = 2, -+ .led_active_high = 1, ++ .vendor = PCI_VENDOR_ID_ATHEROS, ++ .caldata_offset = 0xefe000, ++ .slot = 1, ++ .endian_check = 1, ++ .led_pin = 2, ++ .led_active_high = 1, + }, + }, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++}; ++ ++static struct board_info __initdata board_HW556_C = { ++ .name = "HW556_C", ++ .expected_cpu_id = 0x6358, ++ ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, ++ ++ .has_caldata = 1, ++ .caldata = { ++ { ++ .vendor = PCI_VENDOR_ID_RALINK, ++ .caldata_offset = 0xeffe00, ++ .slot = 1, ++ .eeprom = "rt2x00.eeprom", ++ }, ++ }, ++ ++ .has_enet1 = 1, ++ .enet1 = { ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; + /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { - .name = "96358-502V", -@@ -1338,6 +1425,9 @@ static const struct board_info __initcon + .name = "96358-502V", +@@ -1306,6 +1395,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -111,7 +113,7 @@ &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1408,6 +1498,9 @@ static struct of_device_id const bcm963x +@@ -1376,6 +1468,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch index b6092ed068..fcac77b39d 100644 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -426,6 +426,25 @@ static struct board_info __initdata boar - .force_duplex_full = 1, +@@ -420,6 +420,24 @@ static struct board_info __initdata boar + .force_duplex_full = 1, }, }; + @@ -11,22 +11,21 @@ +// to handle both Annex A as well as Annex B - +// the loaded firmware makes the only difference +static struct board_info __initdata board_rta770w = { -+ .name = "RTA770W", -+ .expected_cpu_id = 0x6345, -+ -+ .has_enet0 = 1, ++ .name = "RTA770W", ++ .expected_cpu_id = 0x6345, + ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1391,6 +1410,7 @@ static const struct board_info __initcon +@@ -1361,6 +1379,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -34,7 +33,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1462,6 +1482,7 @@ static struct of_device_id const bcm963x +@@ -1432,6 +1451,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch index 23b90002ff..937f33b558 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -12,43 +12,42 @@ Signed-off-by: Marcin Jurkowski --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -341,6 +341,43 @@ static struct board_info __initdata boar +@@ -338,6 +338,42 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_FAST2704V2 = { -+ .name = "F@ST2704V2", -+ .expected_cpu_id = 0x6328, ++ .name = "F@ST2704V2", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .has_usbd = 1, -+ -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .has_usbd = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, @@ -56,7 +55,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1400,6 +1437,7 @@ static const struct board_info __initcon +@@ -1369,6 +1405,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -64,7 +63,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1472,6 +1510,7 @@ static struct of_device_id const bcm963x +@@ -1441,6 +1478,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch index 7ad967e3a7..63228b999b 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch @@ -6,41 +6,37 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1330,6 +1330,41 @@ static struct board_info __initdata boar +@@ -1308,6 +1308,37 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_fast2504n = { -+ .name = "F@ST2504n", -+ .expected_cpu_id = 0x6362, -+ -+ .has_enetsw = 1, ++ .name = "F@ST2504n", ++ .expected_cpu_id = 0x6362, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, @@ -48,7 +44,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1491,6 +1526,7 @@ static const struct board_info __initcon +@@ -1459,6 +1490,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -56,7 +52,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1571,6 +1607,7 @@ static struct of_device_id const bcm963x +@@ -1539,6 +1571,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index 403599c1de..f4b7df3bce 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -50,6 +50,55 @@ static struct board_info __initdata boar +@@ -50,6 +50,52 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_3368 */ /* @@ -8,44 +8,41 @@ + */ +#ifdef CONFIG_BCM63XX_CPU_6318 +static struct board_info __initdata board_96318ref = { -+ .name = "96318REF", -+ .expected_cpu_id = 0x6318, ++ .name = "96318REF", ++ .expected_cpu_id = 0x6318, + -+ .has_pci = 1, -+ -+ .has_usbd = 1, ++ .has_pci = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_usbd = 1, + .usbd = { -+ .use_fullspeed = 0, -+ .port_no = 0, ++ .use_fullspeed = 0, ++ .port_no = 0, + }, + -+ .has_enetsw = 1, -+ -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, @@ -56,7 +53,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1465,6 +1514,9 @@ static const struct board_info __initcon +@@ -1429,6 +1475,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -66,7 +63,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1539,6 +1591,9 @@ static struct of_device_id const bcm963x +@@ -1503,6 +1552,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index 2e85271470..e131c53777 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -1,49 +1,46 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -96,6 +96,50 @@ static struct board_info __initdata boar +@@ -93,6 +93,47 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_96318ref_p300 = { -+ .name = "96318REF_P300", -+ .expected_cpu_id = 0x6318, ++ .name = "96318REF_P300", ++ .expected_cpu_id = 0x6318, + -+ .has_pci = 1, -+ -+ .has_usbd = 1, ++ .has_pci = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_usbd = 1, + .usbd = { -+ .use_fullspeed = 0, -+ .port_no = 0, ++ .use_fullspeed = 0, ++ .port_no = 0, + }, + -+ .has_enetsw = 1, -+ -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, @@ -51,7 +48,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1516,6 +1560,7 @@ static const struct board_info __initcon +@@ -1477,6 +1518,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -59,7 +56,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1593,6 +1638,7 @@ static struct of_device_id const bcm963x +@@ -1554,6 +1596,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index de4bff8b9d..33a9f9a9f7 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1552,6 +1552,50 @@ static struct board_info __initdata boar +@@ -1510,6 +1510,45 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -8,39 +8,34 @@ + */ +#ifdef CONFIG_BCM63XX_CPU_63268 +static struct board_info __initdata board_963269bhr = { -+ .name = "963269BHR", -+ .expected_cpu_id = 0x63268, ++ .name = "963269BHR", ++ .expected_cpu_id = 0x63268, + -+ .has_pci = 1, -+ -+ .has_ehci0 = 1, -+ -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ehci0 = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, @@ -51,7 +46,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1629,6 +1673,9 @@ static const struct board_info __initcon +@@ -1587,6 +1626,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -61,7 +56,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1716,6 +1763,7 @@ static struct of_device_id const bcm963x +@@ -1674,6 +1716,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index 2580c8eb72..cf0fbfc6a8 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -8,29 +8,29 @@ Signed-off-by: Adrian Feliks --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -647,6 +647,21 @@ static struct board_info __initdata boar +@@ -633,6 +633,21 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; +static struct board_info __initdata board_96348gw_10_AR1004G = { -+ .name = "AR1004G", -+ .expected_cpu_id = 0x6348, ++ .name = "AR1004G", ++ .expected_cpu_id = 0x6348, + -+ .has_enet1 = 1, -+ .has_pci = 1, -+ ++ .has_pci = 1, ++ ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, +}; + - /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -1647,6 +1662,7 @@ static const struct board_info __initcon + .name = "V2110", +@@ -1600,6 +1615,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1708,6 +1724,7 @@ static struct of_device_id const bcm963x +@@ -1661,6 +1677,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index d3e1ec6de4..6b996931d9 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,50 +1,45 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1608,6 +1608,53 @@ static struct board_info __initdata boar +@@ -1561,6 +1561,48 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_vw6339gu = { -+ .name = "VW6339GU", -+ .expected_cpu_id = 0x63268, ++ .name = "VW6339GU", ++ .expected_cpu_id = 0x63268, + -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 1, -+ -+ .has_enetsw = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "LAN2", ++ .used = 1, ++ .phy_id = 1, ++ .name = "LAN2", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "LAN3", ++ .used = 1, ++ .phy_id = 2, ++ .name = "LAN3", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "LAN4", ++ .used = 1, ++ .phy_id = 3, ++ .name = "LAN4", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "LAN1", ++ .used = 1, ++ .phy_id = 4, ++ .name = "LAN1", + }, -+ + [4] = { -+ .used = 1, -+ .phy_id = 7, -+ .name = "WAN", ++ .used = 1, ++ .phy_id = 7, ++ .name = "WAN", + .mii_override = 1, + .timing_sel = 1, + }, @@ -54,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1691,6 +1738,7 @@ static const struct board_info __initcon +@@ -1644,6 +1686,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -62,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1781,6 +1829,7 @@ static struct of_device_id const bcm963x +@@ -1734,6 +1777,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index 5a422b54de..7530184ca5 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,68 +1,61 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1570,6 +1570,72 @@ static struct board_info __initdata boar +@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 +static struct board_info __initdata board_963268bu_p300 = { -+ .name = "963268BU_P300", -+ .expected_cpu_id = 0x63268, ++ .name = "963268BU_P300", ++ .expected_cpu_id = 0x63268, + -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 1, -+ -+ .has_usbd = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_usbd = 1, + .usbd = { -+ .use_fullspeed = 0, -+ .port_no = 0, ++ .use_fullspeed = 0, ++ .port_no = 0, + }, + -+ .has_enetsw = 1, -+ ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 17, -+ .name = "FE1", ++ .used = 1, ++ .phy_id = 17, ++ .name = "FE1", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "GbE2", ++ .used = 1, ++ .phy_id = 4, ++ .name = "GbE2", + }, -+ + [4] = { -+ .used = 1, -+ .phy_id = 0, -+ .name = "GbE3", ++ .used = 1, ++ .phy_id = 0, ++ .name = "GbE3", + .mii_override = 1, + .timing_sel = 1, + }, -+ + [5] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "GbE1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "GbE1", + .mii_override = 1, + .timing_sel = 1, + }, -+ + [6] = { -+ .used = 1, -+ .phy_id = 24, -+ .name = "GbE4", ++ .used = 1, ++ .phy_id = 24, ++ .name = "GbE4", + .mii_override = 1, + .timing_sel = 1, + }, -+ + [7] = { -+ .used = 1, -+ .phy_id = 25, -+ .name = "GbE5", ++ .used = 1, ++ .phy_id = 25, ++ .name = "GbE5", + .mii_override = 1, + .timing_sel = 1, + }, @@ -71,9 +64,9 @@ +}; + static struct board_info __initdata board_963269bhr = { - .name = "963269BHR", - .expected_cpu_id = 0x63268, -@@ -1737,6 +1803,7 @@ static const struct board_info __initcon + .name = "963269BHR", + .expected_cpu_id = 0x63268, +@@ -1685,6 +1744,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -81,7 +74,7 @@ &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1828,6 +1895,7 @@ static struct of_device_id const bcm963x +@@ -1776,6 +1836,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index 5466c0c4f4..e90c01a48a 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,9 +9,9 @@ #include #include #include -@@ -1564,6 +1566,47 @@ static struct board_info __initdata boar - .has_ohci0 = 1, - .has_ehci0 = 1, +@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar + }, + }, }; + +static struct sprom_fixup __initdata wap5813n_fixups[] = { @@ -24,15 +24,14 @@ +}; + +static struct board_info __initdata board_WAP5813n = { -+ .name = "96369R-1231N", -+ .expected_cpu_id = 0x6368, ++ .name = "96369R-1231N", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [4] = { @@ -46,18 +45,19 @@ + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43222, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = wap5813n_fixups, -+ .num_board_fixups = ARRAY_SIZE(wap5813n_fixups), ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = wap5813n_fixups, ++ .num_board_fixups = ARRAY_SIZE(wap5813n_fixups), + }, +}; #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1801,6 +1844,7 @@ static const struct board_info __initcon +@@ -1742,6 +1785,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1893,6 +1937,7 @@ static struct of_device_id const bcm963x +@@ -1834,6 +1878,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index 31cfb76898..290980b387 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1567,6 +1567,59 @@ static struct board_info __initdata boar - .has_ehci0 = 1, +@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar + }, }; +static struct sprom_fixup __initdata vr3025u_fixups[] = { @@ -14,53 +14,53 @@ +}; + +static struct board_info __initdata board_VR3025u = { -+ .name = "96368M-1541N", -+ .expected_cpu_id = 0x6368, ++ .name = "96368M-1541N", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43222, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = vr3025u_fixups, -+ .num_board_fixups = ARRAY_SIZE(vr3025u_fixups), ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vr3025u_fixups, ++ .num_board_fixups = ARRAY_SIZE(vr3025u_fixups), + }, +}; + static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1844,6 +1897,7 @@ static const struct board_info __initcon +@@ -1785,6 +1838,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1937,6 +1991,7 @@ static struct of_device_id const bcm963x +@@ -1878,6 +1932,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index 207f6810fe..4a77754079 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1620,6 +1620,59 @@ static struct board_info __initdata boar +@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar }, }; @@ -14,53 +14,53 @@ +}; + +static struct board_info __initdata board_VR3025un = { -+ .name = "96368M-1341N", -+ .expected_cpu_id = 0x6368, ++ .name = "96368M-1341N", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43222, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = vr3025un_fixups, -+ .num_board_fixups = ARRAY_SIZE(vr3025un_fixups), ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vr3025un_fixups, ++ .num_board_fixups = ARRAY_SIZE(vr3025un_fixups), + }, +}; + static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1898,6 +1951,7 @@ static const struct board_info __initcon +@@ -1839,6 +1892,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1992,6 +2046,7 @@ static struct of_device_id const bcm963x +@@ -1933,6 +1987,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index 2941a954cf..fd8eaba28e 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,55 +1,55 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1576,6 +1576,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; +static struct board_info __initdata board_P870HW51A_V2 = { -+ .name = "P870HW-51a_v2", -+ .expected_cpu_id = 0x6368, ++ .name = "P870HW-51a_v2", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_VR3025u = { - .name = "96368M-1541N", - .expected_cpu_id = 0x6368, -@@ -1950,6 +1992,7 @@ static const struct board_info __initcon + .name = "96368M-1541N", + .expected_cpu_id = 0x6368, +@@ -1891,6 +1933,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2048,6 +2091,7 @@ static struct of_device_id const bcm963x +@@ -1989,6 +2032,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index e7751c353e..6cd061cd3d 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,43 +1,43 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1262,6 +1262,36 @@ static struct board_info __initdata boar +@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_HW520 = { -+ .name = "HW6358GW_B", -+ .expected_cpu_id = 0x6358, ++ .name = "HW6358GW_B", ++ .expected_cpu_id = 0x6358, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enet0 = 1, ++ .has_enet0 = 1, + .enet0 = { -+ .has_phy = 1, -+ .use_internal_phy = 1, ++ .has_phy = 1, ++ .use_internal_phy = 1, + }, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4318, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4318, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_HW553 = { - .name = "HW553", - .expected_cpu_id = 0x6358, -@@ -1978,6 +2008,7 @@ static const struct board_info __initcon + .name = "HW553", + .expected_cpu_id = 0x6358, +@@ -1919,6 +1949,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2068,6 +2099,7 @@ static struct of_device_id const bcm963x +@@ -2009,6 +2040,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index 930cbdfd98..df7621dbf8 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -1,56 +1,56 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -349,6 +349,49 @@ static struct board_info __initdata boar +@@ -341,6 +341,49 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_A4001N = { -+ .name = "96328dg2x2", -+ .expected_cpu_id = 0x6328, ++ .name = "96328dg2x2", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43225, -+ .pci_bus = 1, -+ .pci_dev = 0, ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, + }, +}; + static struct board_info __initdata board_A4001N1 = { - .name = "963281T_TEF", - .expected_cpu_id = 0x6328, -@@ -1960,6 +2003,7 @@ static const struct board_info __initcon + .name = "963281T_TEF", + .expected_cpu_id = 0x6328, +@@ -1901,6 +1944,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2045,6 +2089,7 @@ static struct of_device_id const bcm963x +@@ -1986,6 +2030,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 18421a9108..0e775f891b 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -142,6 +142,74 @@ static struct board_info __initdata boar +@@ -136,6 +136,72 @@ static struct board_info __initdata boar }, }, }; @@ -27,55 +27,53 @@ +}; + +static struct board_info __initdata board_dsl_2751b_d1 = { -+ .name = "AW5200B", -+ .expected_cpu_id = 0x6318, ++ .name = "AW5200B", ++ .expected_cpu_id = 0x6318, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .has_enetsw = 1, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43217, -+ .pci_bus = 1, -+ .pci_dev = 0, -+ .board_fixups = dsl2751b_e1_fixups, -+ .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), ++ .type = SPROM_BCM43217, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ .board_fixups = dsl2751b_e1_fixups, ++ .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), + }, +}; #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1997,6 +2065,7 @@ static const struct board_info __initcon +@@ -1938,6 +2004,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -83,7 +81,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2087,6 +2156,7 @@ static struct of_device_id const bcm963x +@@ -2028,6 +2095,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index ffb1e2d863..e8bdf24983 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,28 +1,28 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1708,6 +1708,30 @@ static struct board_info __initdata boar - .has_ehci0 = 1, +@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar + }, }; +static struct board_info __initdata board_DGND3700v1_3800B = { -+ .name = "DGND3700v1_3800B", -+ .expected_cpu_id = 0x6368, ++ .name = "DGND3700v1_3800B", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [5] = { -+ .used = 1, -+ .phy_id = 0xff, ++ .used = 1, ++ .phy_id = 0xff, + .bypass_link = 1, + .force_speed = 1000, + .force_duplex_full = 1, -+ .name = "RGMII", ++ .name = "RGMII", + }, + }, + }, @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2136,6 +2160,7 @@ static const struct board_info __initcon +@@ -2075,6 +2099,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2238,6 +2263,7 @@ static struct of_device_id const bcm963x +@@ -2177,6 +2202,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index 0da3634a21..470cbbfb7d 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,38 +1,38 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1373,6 +1373,31 @@ static struct board_info __initdata boar +@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_homehub2a = { -+ .name = "HOMEHUB2A", -+ .expected_cpu_id = 0x6358, ++ .name = "HOMEHUB2A", ++ .expected_cpu_id = 0x6358, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enet1 = 1, ++ .has_enet1 = 1, + .enet1 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, ++ .has_phy = 1, ++ .phy_id = 0, ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4322, -+ .pci_bus = 0, -+ .pci_dev = 1, ++ .type = SPROM_BCM4322, ++ .pci_bus = 0, ++ .pci_dev = 1, + }, +}; + static struct board_info __initdata board_HW520 = { - .name = "HW6358GW_B", - .expected_cpu_id = 0x6358, -@@ -2145,6 +2170,7 @@ static const struct board_info __initcon + .name = "HW6358GW_B", + .expected_cpu_id = 0x6358, +@@ -2084,6 +2109,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2252,6 +2278,7 @@ static struct of_device_id const bcm963x +@@ -2191,6 +2217,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index f89c19233e..83c9cbedb6 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,50 +1,50 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1757,6 +1757,52 @@ static struct board_info __initdata boar +@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_HG655b = { -+ .name = "HW65x", -+ .expected_cpu_id = 0x6368, ++ .name = "HW65x", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_caldata = 1, ++ .has_caldata = 1, + .caldata = { + { -+ .vendor = PCI_VENDOR_ID_RALINK, -+ .caldata_offset = 0x7c0000, -+ .slot = 1, -+ .eeprom = "rt2x00.eeprom", ++ .vendor = PCI_VENDOR_ID_RALINK, ++ .caldata_offset = 0x7c0000, ++ .slot = 1, ++ .eeprom = "rt2x00.eeprom", + }, + }, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2187,6 +2233,7 @@ static const struct board_info __initcon +@@ -2126,6 +2172,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2290,6 +2337,7 @@ static struct of_device_id const bcm963x +@@ -2229,6 +2276,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index 4a74960e5d..34c74831a2 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -1,52 +1,51 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -210,6 +210,45 @@ static struct board_info __initdata boar - .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), +@@ -202,6 +202,44 @@ static struct board_info __initdata boar + .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), }, }; + +static struct board_info __initdata board_FAST2704N = { -+ .name = "F@ST2704N", -+ .expected_cpu_id = 0x6318, ++ .name = "F@ST2704N", ++ .expected_cpu_id = 0x6318, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .has_enetsw = 1, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "Port 1", ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, ++ ++ .use_fallback_sprom = 1, +}; #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2161,6 +2200,7 @@ static const struct board_info __initcon +@@ -2100,6 +2138,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -54,7 +53,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2255,6 +2295,7 @@ static struct of_device_id const bcm963x +@@ -2194,6 +2233,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 607e49d957..27195ddd45 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1990,6 +1990,59 @@ static struct board_info __initdata boar +@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar }, }; @@ -14,53 +14,53 @@ +}; + +static struct board_info __initdata board_VR3026e = { -+ .name = "96368MT-1341N1", -+ .expected_cpu_id = 0x6368, ++ .name = "96368MT-1341N1", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43222, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = vr3026e_fixups, -+ .num_board_fixups = ARRAY_SIZE(vr3026e_fixups), ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vr3026e_fixups, ++ .num_board_fixups = ARRAY_SIZE(vr3026e_fixups), + }, +}; + static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2277,6 +2330,7 @@ static const struct board_info __initcon +@@ -2215,6 +2268,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2377,6 +2431,7 @@ static struct of_device_id const bcm963x +@@ -2315,6 +2369,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index 24b12f7ad7..6d8aedb7dc 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -1,57 +1,57 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -623,6 +623,50 @@ static struct board_info __initdata boar +@@ -610,6 +610,50 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_R5010UNV2 = { -+ .name = "96328ang", -+ .expected_cpu_id = 0x6328, ++ .name = "96328ang", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43217, -+ .pci_bus = 1, -+ .pci_dev = 0, ++ .type = SPROM_BCM43217, ++ .pci_bus = 1, ++ .pci_dev = 0, + }, +}; + #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2264,6 +2308,7 @@ static const struct board_info __initcon +@@ -2202,6 +2246,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2359,6 +2404,7 @@ static struct of_device_id const bcm963x +@@ -2297,6 +2342,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index 9ff6a10397..5842addf14 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,50 +1,50 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1886,6 +1886,52 @@ static struct board_info __initdata boar +@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_HG622 = { -+ .name = "96368MVWG_hg622", -+ .expected_cpu_id = 0x6368, ++ .name = "96368MVWG_hg622", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_caldata = 1, ++ .has_caldata = 1, + .caldata = { + { -+ .vendor = PCI_VENDOR_ID_RALINK, -+ .caldata_offset = 0xfa0000, -+ .slot = 1, -+ .eeprom = "rt2x00.eeprom", ++ .vendor = PCI_VENDOR_ID_RALINK, ++ .caldata_offset = 0xfa0000, ++ .slot = 1, ++ .eeprom = "rt2x00.eeprom", + }, + }, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2371,6 +2417,7 @@ static const struct board_info __initcon +@@ -2309,6 +2355,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2479,6 +2526,7 @@ static struct of_device_id const bcm963x +@@ -2417,6 +2464,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 1eac718426..9ed32020e2 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1840,6 +1840,42 @@ static struct board_info __initdata boar +@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar }, }; @@ -9,15 +9,15 @@ +}; + +static struct board_info __initdata board_EVG2000 = { -+ .name = "96369PVG", -+ .expected_cpu_id = 0x6368, ++ .name = "96369PVG", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [5] = { @@ -30,20 +30,21 @@ + }, + }, + }, -+ .use_fallback_sprom = 1, ++ ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM4322, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = EVG2000_fixups, -+ .num_board_fixups = ARRAY_SIZE(EVG2000_fixups), ++ .type = SPROM_BCM4322, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = EVG2000_fixups, ++ .num_board_fixups = ARRAY_SIZE(EVG2000_fixups), + }, +}; + static struct board_info __initdata board_HG655b = { - .name = "HW65x", - .expected_cpu_id = 0x6368, -@@ -2417,6 +2453,7 @@ static const struct board_info __initcon + .name = "HW65x", + .expected_cpu_id = 0x6368, +@@ -2355,6 +2392,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -51,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2529,6 +2566,7 @@ static struct of_device_id const bcm963x +@@ -2467,6 +2505,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index 2722b9ef4e..29e97108ed 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,58 +1,55 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1730,6 +1730,51 @@ static struct board_info __initdata boar +@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 +static struct board_info __initdata board_AV4202N = { -+ .name = "96368_Swiss_S1", -+ .expected_cpu_id = 0x6368, ++ .name = "96368_Swiss_S1", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "port1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "port1", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "port2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "port3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "port4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", + }, + }, + }, -+ .use_fallback_sprom = 1, -+ .fallback_sprom = { -+ .pci_bus = 0, -+ .pci_dev = 1, -+ }, + ++ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .pci_bus = 0, ++ .pci_dev = 1, ++ }, +}; + static struct board_info __initdata board_96368mvwg = { - .name = "96368MVWG", - .expected_cpu_id = 0x6368, -@@ -2450,6 +2495,7 @@ static const struct board_info __initcon + .name = "96368MVWG", + .expected_cpu_id = 0x6368, +@@ -2389,6 +2431,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -60,7 +57,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2557,6 +2603,7 @@ static struct of_device_id const bcm963x +@@ -2496,6 +2539,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 8beea94da0..36c6c14aa3 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2214,6 +2214,106 @@ static struct board_info __initdata boar +@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar }, }; @@ -60,54 +60,54 @@ +}; + +static struct board_info __initdata board_VH4032N = { -+ .name = "VH4032N", -+ .expected_cpu_id = 0x6368, ++ .name = "VH4032N", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "LAN4", ++ .name = "LAN4", + }, + [1] = { -+ .used = 1, ++ .used = 1, + .phy_id = 2, -+ .name = "LAN3", ++ .name = "LAN3", + }, + [2] = { -+ .used = 1, ++ .used = 1, + .phy_id = 3, -+ .name = "LAN2", ++ .name = "LAN2", + }, + [3] = { -+ .used = 1, ++ .used = 1, + .phy_id = 4, -+ .name = "LAN1", ++ .name = "LAN1", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43222, -+ .pci_bus = 0, -+ .pci_dev = 1, -+ .board_fixups = vh4032n_fixups, -+ .num_board_fixups = ARRAY_SIZE(vh4032n_fixups), ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vh4032n_fixups, ++ .num_board_fixups = ARRAY_SIZE(vh4032n_fixups), + }, +}; + static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2503,6 +2603,7 @@ static const struct board_info __initcon +@@ -2439,6 +2539,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2614,6 +2715,7 @@ static struct of_device_id const bcm963x +@@ -2550,6 +2651,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index ec7e4bacdc..23b8c78901 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,36 +1,36 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2064,6 +2064,29 @@ static struct board_info __initdata boar +@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_R1000H = { -+ .name = "R1000H", -+ .expected_cpu_id = 0x6368, ++ .name = "R1000H", ++ .expected_cpu_id = 0x6368, + -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [5] = { -+ .used = 1, -+ .phy_id = 0xff, ++ .used = 1, ++ .phy_id = 0xff, + .bypass_link = 1, + .force_speed = 1000, + .force_duplex_full = 1, -+ .name = "RGMII", ++ .name = "RGMII", + }, + }, + }, +}; + static struct board_info __initdata board_VR3025u = { - .name = "96368M-1541N", - .expected_cpu_id = 0x6368, -@@ -2603,6 +2626,7 @@ static const struct board_info __initcon + .name = "96368M-1541N", + .expected_cpu_id = 0x6368, +@@ -2539,6 +2562,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2704,6 +2728,7 @@ static struct of_device_id const bcm963x +@@ -2640,6 +2664,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 388b71aa9b..40235fb21b 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -143,6 +143,67 @@ static struct board_info __initdata boar +@@ -137,6 +137,65 @@ static struct board_info __initdata boar }, }; @@ -19,56 +19,54 @@ +}; + +static struct board_info __initdata board_AR5315u = { -+ .name = "96318A-1441N1", -+ .expected_cpu_id = 0x6318, ++ .name = "96318A-1441N1", ++ .expected_cpu_id = 0x6318, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .has_enetsw = 1, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, ++ .used = 1, + .phy_id = 1, -+ .name = "LAN4", ++ .name = "LAN4", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "LAN3", ++ .used = 1, ++ .phy_id = 2, ++ .name = "LAN3", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "LAN2", ++ .used = 1, ++ .phy_id = 3, ++ .name = "LAN2", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "LAN1", ++ .used = 1, ++ .phy_id = 4, ++ .name = "LAN1", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43217, -+ .pci_bus = 1, -+ .pci_dev = 0, -+ .board_fixups = ar5315u_fixups, -+ .num_board_fixups = ARRAY_SIZE(ar5315u_fixups), ++ .type = SPROM_BCM43217, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ .board_fixups = ar5315u_fixups, ++ .num_board_fixups = ARRAY_SIZE(ar5315u_fixups), + }, +}; + static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2546,6 +2607,7 @@ static const struct board_info __initcon +@@ -2482,6 +2541,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -76,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2648,6 +2710,7 @@ static struct of_device_id const bcm963x +@@ -2584,6 +2644,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index a59571a096..c07ebac189 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -357,6 +357,73 @@ static struct board_info __initdata boar +@@ -345,6 +345,71 @@ static struct board_info __initdata boar }, }; @@ -25,56 +25,54 @@ +}; + +static struct board_info __initdata board_AD1018 = { -+ .name = "96328avngr", -+ .expected_cpu_id = 0x6328, ++ .name = "96328avngr", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "FIBRE", ++ .used = 1, ++ .phy_id = 1, ++ .name = "FIBRE", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "LAN3", ++ .used = 1, ++ .phy_id = 2, ++ .name = "LAN3", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "LAN2", ++ .used = 1, ++ .phy_id = 3, ++ .name = "LAN2", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "LAN1", ++ .used = 1, ++ .phy_id = 4, ++ .name = "LAN1", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43217, -+ .pci_bus = 1, -+ .pci_dev = 0, -+ .board_fixups = ad1018_fixups, -+ .num_board_fixups = ARRAY_SIZE(ad1018_fixups), ++ .type = SPROM_BCM43217, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ .board_fixups = ad1018_fixups, ++ .num_board_fixups = ARRAY_SIZE(ad1018_fixups), + }, +}; + static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2613,6 +2680,7 @@ static const struct board_info __initcon +@@ -2547,6 +2612,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -82,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2724,6 +2792,8 @@ static struct of_device_id const bcm963x +@@ -2658,6 +2724,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 8ab891f370..6a09e1abc6 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,56 +1,49 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2662,6 +2662,49 @@ static struct board_info __initdata boar +@@ -2594,6 +2594,42 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_BSKYB_63168 = { -+ .name = "BSKYB_63168", -+ .expected_cpu_id = 0x63268, ++ .name = "BSKYB_63168", ++ .expected_cpu_id = 0x63268, + -+ .has_pci = 1, -+ .use_fallback_sprom = 0, -+ -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 2, -+ -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, -+ + }, + }, +}; #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2767,6 +2810,7 @@ static const struct board_info __initcon +@@ -2699,6 +2735,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -58,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x +@@ -2812,6 +2849,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 4c7ed72862..37e946a6ef 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,51 +1,48 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2616,6 +2616,44 @@ static struct board_info __initdata boar +@@ -2553,6 +2553,41 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_VR3032u = { -+ .name = "963168M-1841N1", -+ .expected_cpu_id = 0x63268, ++ .name = "963168M-1841N1", ++ .expected_cpu_id = 0x63268, + -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "LAN2", ++ .used = 1, ++ .phy_id = 1, ++ .name = "LAN2", + }, -+ + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "LAN3", ++ .used = 1, ++ .phy_id = 2, ++ .name = "LAN3", + }, -+ + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "LAN4", ++ .used = 1, ++ .phy_id = 3, ++ .name = "LAN4", + }, -+ + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "LAN1", ++ .used = 1, ++ .phy_id = 4, ++ .name = "LAN1", + }, + }, + }, +}; + static struct board_info __initdata board_vw6339gu = { - .name = "VW6339GU", - .expected_cpu_id = 0x63268, -@@ -2809,6 +2847,7 @@ static const struct board_info __initcon + .name = "VW6339GU", + .expected_cpu_id = 0x63268, +@@ -2734,6 +2769,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -53,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2923,6 +2962,7 @@ static struct of_device_id const bcm963x +@@ -2848,6 +2884,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index e8f3044385..9f2e7eaf29 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,38 +1,37 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1818,6 +1818,31 @@ static struct board_info __initdata boar +@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_dgnd3700v2 = { -+ .name = "96362ADVN2xh", -+ .expected_cpu_id = 0x6362, ++ .name = "96362ADVN2xh", ++ .expected_cpu_id = 0x6362, + -+ .has_pci = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, -+ -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [4] = { -+ .used = 1, -+ .phy_id = 0xff, ++ .used = 1, ++ .phy_id = 0xff, + .bypass_link = 1, + .force_speed = 1000, + .force_duplex_full = 1, -+ .name = "RGMII", ++ .name = "RGMII", + }, + }, + }, +}; + static struct board_info __initdata board_fast2504n = { - .name = "F@ST2504n", - .expected_cpu_id = 0x6362, -@@ -2826,6 +2851,7 @@ static const struct board_info __initcon + .name = "F@ST2504n", + .expected_cpu_id = 0x6362, +@@ -2748,6 +2772,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -40,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2940,6 +2966,7 @@ static struct of_device_id const bcm963x +@@ -2862,6 +2887,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index af4baf4710..61ef47e15d 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,18 +1,18 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2641,6 +2641,31 @@ static struct board_info __initdata boar +@@ -2577,6 +2577,31 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_VG8050 = { -+ .name = "963169P-1861N5", -+ .expected_cpu_id = 0x63268, ++ .name = "963169P-1861N5", ++ .expected_cpu_id = 0x63268, + -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 2, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [6] = { @@ -30,9 +30,9 @@ +}; + static struct board_info __initdata board_VR3032u = { - .name = "963168M-1841N1", - .expected_cpu_id = 0x63268, -@@ -2873,6 +2898,7 @@ static const struct board_info __initcon + .name = "963168M-1841N1", + .expected_cpu_id = 0x63268, +@@ -2794,6 +2819,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2989,6 +3015,7 @@ static struct of_device_id const bcm963x +@@ -2910,6 +2936,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index cce5720322..8ff84c04b2 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1877,6 +1877,37 @@ static struct board_info __initdata boar +@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar }, }, }; @@ -9,8 +9,8 @@ + .name = "hg253s", + .expected_cpu_id = 0x6362, + -+ .has_ehci0 = 1, + .has_ohci0 = 1, ++ .has_ehci0 = 1, + .num_usbh_ports = 1, + + .has_enetsw = 1, @@ -28,7 +28,7 @@ + + [5] = { + .used = 1, -+ .phy_id = 24, ++ .phy_id = 24, + .timing_sel = 1, + .name = "WAN", + }, @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2878,6 +2909,7 @@ static const struct board_info __initcon +@@ -2799,6 +2830,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2992,6 +3024,7 @@ static struct of_device_id const bcm963x +@@ -2913,6 +2945,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index c07b65b768..ea373ca935 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -1,56 +1,56 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -627,6 +627,49 @@ static struct board_info __initdata boar +@@ -612,6 +612,49 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_PDG_A4001N_A_000_1A1_AX = { -+ .name = "96328avng", -+ .expected_cpu_id = 0x6328, ++ .name = "96328avng", ++ .expected_cpu_id = 0x6328, + -+ .has_pci = 1, -+ .use_fallback_sprom = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 1, -+ .has_enetsw = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "Port 1", ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", + }, + [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "Port 2", ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", + }, + [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "Port 3", ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", + }, + [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "Port 4", ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", + }, + }, + }, + ++ .use_fallback_sprom = 1, + .fallback_sprom = { -+ .type = SPROM_BCM43225, -+ .pci_bus = 1, -+ .pci_dev = 0, ++ .type = SPROM_BCM43225, ++ .pci_bus = 1, ++ .pci_dev = 0, + }, +}; + static struct board_info __initdata board_A4001N1 = { - .name = "963281T_TEF", - .expected_cpu_id = 0x6328, -@@ -2847,6 +2890,7 @@ static const struct board_info __initcon + .name = "963281T_TEF", + .expected_cpu_id = 0x6328, +@@ -2768,6 +2811,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2952,6 +2996,7 @@ static struct of_device_id const bcm963x +@@ -2873,6 +2917,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index 8b48155d25..cb7abb3966 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,27 +1,26 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2867,6 +2867,37 @@ static struct board_info __initdata boar +@@ -2788,6 +2788,36 @@ static struct board_info __initdata boar }, }, }; + +static struct board_info __initdata board_H500s = { -+ .name = "BXK00C-1.6", -+ .expected_cpu_id = 0x63268, ++ .name = "BXK00C-1.6", ++ .expected_cpu_id = 0x63268, + -+ .has_ehci0 = 1, -+ .has_ohci0 = 1, -+ .num_usbh_ports = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 1, + -+ .has_enetsw = 1, ++ .has_enetsw = 1, + .enetsw = { + .used_ports = { + [3] = { -+ .used = 1, ++ .used = 1, + .phy_id = 12, -+ .name = "WAN", ++ .name = "WAN", + }, -+ + [4] = { + .used = 1, + .phy_id = 0, @@ -38,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2978,6 +3009,7 @@ static const struct board_info __initcon +@@ -2899,6 +2929,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -46,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3096,6 +3128,8 @@ static struct of_device_id const bcm963x +@@ -3017,6 +3048,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From 440d5996efa8baa84b3d276f058a28f1e840e538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 10:06:34 +0200 Subject: [PATCH 40/45] bcm63xx: remove invalid EHCI nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no EHCI controller on BCM6348. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch | 7 +++---- target/linux/bcm63xx/patches-5.4/508-board_hw553.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch | 8 ++++---- target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch | 4 ++-- .../bcm63xx/patches-5.4/514-board_ct536_ct5621.patch | 7 +++---- .../bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch | 2 +- .../linux/bcm63xx/patches-5.4/516-board_96348A-122.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch | 4 ++-- .../518-bcm63xx-add-support-for-96368MVWG-board.patch | 6 +++--- .../519-bcm63xx-add-support-for-96368MVNgr-board.patch | 6 +++--- .../521-MIPS-BCM63XX-add-963281TAN-reference-board.patch | 4 ++-- .../bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch | 6 +++--- .../bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/526-board_nb6.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch | 4 ++-- .../linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/532-board_hw556.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch | 4 ++-- .../linux/bcm63xx/patches-5.4/535-board_fast2504n.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch | 4 ++-- .../bcm63xx/patches-5.4/537-board_96318ref_p300.patch | 4 ++-- .../bcm63xx/patches-5.4/538-board_bcm963269bhr.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch | 6 +++--- .../bcm63xx/patches-5.4/541-board_963268gu_p300.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch | 6 +++--- .../bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/546-board_hw520.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch | 4 ++-- .../bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch | 4 ++-- .../bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/550-board_homehub2a.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/552-board_fast2704n.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/555-board_HG622.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/562-board_sr102.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch | 6 +++--- .../567-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 4 ++-- target/linux/bcm63xx/patches-5.4/568-board-H500s.patch | 6 +++--- 60 files changed, 158 insertions(+), 160 deletions(-) diff --git a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch index 536e033928..f975236d95 100644 --- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -392,6 +392,31 @@ static struct board_info __initdata boar +@@ -392,6 +392,30 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -12,7 +12,6 @@ + .has_pccard = 1, + .has_pci = 1, + .has_ohci0 = 1, -+ .has_ehci0 = 1, + + .has_enet0 = 1, + .enet0 = { @@ -32,7 +31,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -615,6 +640,7 @@ static const struct board_info __initcon +@@ -615,6 +639,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, @@ -40,7 +39,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -658,6 +684,7 @@ static struct of_device_id const bcm963x +@@ -658,6 +683,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch index 841ee7f2be..d0e7e64acc 100644 --- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -607,6 +607,31 @@ static struct board_info __initdata boar +@@ -606,6 +606,31 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -32,7 +32,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -651,6 +676,7 @@ static const struct board_info __initcon +@@ -650,6 +675,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -40,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -694,6 +720,7 @@ static struct of_device_id const bcm963x +@@ -693,6 +719,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch index 8e48b736db..103343c874 100644 --- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch +++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -648,6 +661,7 @@ static const struct board_info __initcon +@@ -647,6 +660,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -691,6 +705,7 @@ static struct of_device_id const bcm963x +@@ -690,6 +704,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch index 4df643a721..498d934d5a 100644 --- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -645,6 +645,20 @@ static struct board_info __initdata boar +@@ -644,6 +644,20 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -691,6 +705,7 @@ static const struct board_info __initcon +@@ -690,6 +704,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, @@ -29,7 +29,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -742,6 +757,7 @@ static struct of_device_id const bcm963x +@@ -741,6 +756,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index d7526c9fdf..3560df0230 100644 --- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -430,6 +430,27 @@ static struct board_info __initdata boar +@@ -429,6 +429,27 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -694,6 +715,7 @@ static const struct board_info __initcon +@@ -693,6 +714,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, @@ -36,7 +36,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -732,6 +754,7 @@ static struct of_device_id const bcm963x +@@ -731,6 +753,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -44,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -791,6 +814,22 @@ void __init board_bcm963xx_init(void) +@@ -790,6 +813,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch index 1ae504cae9..fe3627bcc6 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch @@ -23,7 +23,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -716,6 +732,7 @@ static const struct board_info __initcon +@@ -715,6 +731,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, @@ -31,7 +31,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -754,6 +771,7 @@ static struct of_device_id const bcm963x +@@ -753,6 +770,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch index b2ad8f22f6..50e5133be9 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -222,6 +222,31 @@ static struct board_info __initdata boar +@@ -222,6 +222,30 @@ static struct board_info __initdata boar }, }; @@ -11,7 +11,6 @@ + .has_pccard = 1, + .has_pci = 1, + .has_ohci0 = 1, -+ .has_ehci0 = 1, + + .has_enet1 = 1, + .enet1 = { @@ -32,7 +31,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -733,6 +758,7 @@ static const struct board_info __initcon +@@ -732,6 +756,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, @@ -40,7 +39,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -773,6 +799,8 @@ static struct of_device_id const bcm963x +@@ -772,6 +797,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch index 9ae70ea84e..1460256e8c 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch +++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -615,6 +615,7 @@ static struct board_info __initdata boar +@@ -613,6 +613,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch index 99c224e5ac..9b8f1a1699 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -247,6 +247,29 @@ static struct board_info __initdata boar +@@ -246,6 +246,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -760,6 +783,7 @@ static const struct board_info __initcon +@@ -758,6 +781,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x +@@ -799,6 +823,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, diff --git a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch index f5427713b7..7852f9f32b 100644 --- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch @@ -35,7 +35,7 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", .expected_cpu_id = 0x6348, -@@ -784,6 +812,7 @@ static const struct board_info __initcon +@@ -782,6 +810,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -835,6 +864,7 @@ static struct of_device_id const bcm963x +@@ -833,6 +862,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch index 0fd5ce5758..50325354f2 100644 --- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -776,6 +776,52 @@ static struct board_info __initdata boar +@@ -774,6 +774,52 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -63,7 +63,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -826,6 +872,9 @@ static const struct board_info __initcon +@@ -824,6 +870,9 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -73,7 +73,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -886,6 +935,7 @@ static struct of_device_id const bcm963x +@@ -884,6 +933,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch index 2502c1252f..15d99fdfb9 100644 --- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -819,6 +819,41 @@ static struct board_info __initdata boar +@@ -817,6 +817,41 @@ static struct board_info __initdata boar }, }, }; @@ -51,7 +51,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -874,6 +909,7 @@ static const struct board_info __initcon +@@ -872,6 +907,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, @@ -59,7 +59,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ }; -@@ -935,6 +971,7 @@ static struct of_device_id const bcm963x +@@ -933,6 +969,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch index c3f460806e..f4554ea87a 100644 --- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -49,7 +49,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -891,6 +924,7 @@ static const struct board_info __initcon +@@ -889,6 +922,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -57,7 +57,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x +@@ -943,6 +977,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch index f982660efd..e8d2710acf 100644 --- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch @@ -61,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -925,6 +969,7 @@ static const struct board_info __initcon +@@ -923,6 +967,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -69,7 +69,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x +@@ -979,6 +1024,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch index 913f12f8d6..5b29121cca 100644 --- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -556,6 +556,23 @@ static struct board_info __initdata boar +@@ -555,6 +555,23 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_96348_D4PW = { .name = "D-4P-W", .expected_cpu_id = 0x6348, -@@ -999,6 +1016,7 @@ static const struct board_info __initcon +@@ -997,6 +1014,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, @@ -32,7 +32,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x +@@ -1050,6 +1068,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch index ea5035b4a0..200bed3661 100644 --- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -855,6 +855,30 @@ static struct board_info __initdata boar +@@ -853,6 +853,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1027,6 +1051,7 @@ static const struct board_info __initcon +@@ -1025,6 +1049,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -39,7 +39,7 @@ &board_HW553, &board_spw303v, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x +@@ -1082,6 +1107,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch index 9cfd82d7ee..f21b98c91f 100644 --- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -917,6 +917,31 @@ static struct board_info __initdata boar +@@ -915,6 +915,31 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -32,7 +32,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1054,6 +1079,7 @@ static const struct board_info __initcon +@@ -1052,6 +1077,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -40,7 +40,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x +@@ -1110,6 +1136,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch index fd7ab626f7..12abaef899 100644 --- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -944,6 +944,31 @@ static struct board_info __initdata boar +@@ -942,6 +942,31 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -32,7 +32,7 @@ /* * known 6368 boards */ -@@ -1081,6 +1106,9 @@ static const struct board_info __initcon +@@ -1079,6 +1104,9 @@ static const struct board_info __initcon &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -42,7 +42,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1149,6 +1177,9 @@ static struct of_device_id const bcm963x +@@ -1147,6 +1175,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch index 924f1f6cac..986d3ebe31 100644 --- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -490,6 +490,22 @@ static struct board_info __initdata boar +@@ -489,6 +489,22 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -23,7 +23,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1079,6 +1095,7 @@ static const struct board_info __initcon +@@ -1077,6 +1093,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1151,6 +1168,7 @@ static struct of_device_id const bcm963x +@@ -1149,6 +1166,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch index 32164c6cfa..53cee21a5d 100644 --- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1076,6 +1119,7 @@ static const struct board_info __initcon +@@ -1074,6 +1117,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -58,7 +58,7 @@ &board_dsl_274xb_f1, #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x +@@ -1136,6 +1180,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch index 037d42fbc5..7eff6cc55a 100644 --- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch @@ -79,7 +79,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1118,6 +1190,7 @@ static const struct board_info __initcon +@@ -1116,6 +1188,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -87,7 +87,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x +@@ -1183,6 +1256,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch index 0ede51519b..141fa6dbdb 100644 --- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch @@ -61,7 +61,7 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1190,6 +1244,7 @@ static const struct board_info __initcon +@@ -1188,6 +1242,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -69,7 +69,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x +@@ -1256,6 +1311,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch index 0aa94fb32f..2d3e39b50a 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1258,6 +1271,7 @@ static const struct board_info __initcon +@@ -1256,6 +1269,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1325,6 +1339,7 @@ static struct of_device_id const bcm963x +@@ -1323,6 +1337,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch index f03de16982..deab307319 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -1102,6 +1103,94 @@ static struct board_info __initdata boar +@@ -1100,6 +1101,94 @@ static struct board_info __initdata boar }, }; @@ -103,7 +103,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1306,6 +1395,9 @@ static const struct board_info __initcon +@@ -1304,6 +1393,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -113,7 +113,7 @@ &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1376,6 +1468,9 @@ static struct of_device_id const bcm963x +@@ -1374,6 +1466,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch index fcac77b39d..ce6cda7721 100644 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch @@ -25,7 +25,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1361,6 +1379,7 @@ static const struct board_info __initcon +@@ -1359,6 +1377,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -33,7 +33,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1432,6 +1451,7 @@ static struct of_device_id const bcm963x +@@ -1430,6 +1449,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch index 937f33b558..fde3b601f6 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1369,6 +1405,7 @@ static const struct board_info __initcon +@@ -1367,6 +1403,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -63,7 +63,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1441,6 +1478,7 @@ static struct of_device_id const bcm963x +@@ -1439,6 +1476,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch index 63228b999b..5974e9a159 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1308,6 +1308,37 @@ static struct board_info __initdata boar +@@ -1306,6 +1306,37 @@ static struct board_info __initdata boar }, }, }; @@ -44,7 +44,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1459,6 +1490,7 @@ static const struct board_info __initcon +@@ -1457,6 +1488,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -52,7 +52,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1539,6 +1571,7 @@ static struct of_device_id const bcm963x +@@ -1537,6 +1569,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index f4b7df3bce..66e32ef47a 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -53,7 +53,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1429,6 +1475,9 @@ static const struct board_info __initcon +@@ -1427,6 +1473,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -63,7 +63,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1503,6 +1552,9 @@ static struct of_device_id const bcm963x +@@ -1501,6 +1550,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index e131c53777..d5248fd02c 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -48,7 +48,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1477,6 +1518,7 @@ static const struct board_info __initcon +@@ -1475,6 +1516,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -56,7 +56,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1554,6 +1596,7 @@ static struct of_device_id const bcm963x +@@ -1552,6 +1594,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index 33a9f9a9f7..1b5f117739 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1510,6 +1510,45 @@ static struct board_info __initdata boar +@@ -1508,6 +1508,45 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -46,7 +46,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1587,6 +1626,9 @@ static const struct board_info __initcon +@@ -1585,6 +1624,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -56,7 +56,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1674,6 +1716,7 @@ static struct of_device_id const bcm963x +@@ -1672,6 +1714,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index cf0fbfc6a8..51a71cae7e 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { .name = "V2110", -@@ -1600,6 +1615,7 @@ static const struct board_info __initcon +@@ -1598,6 +1613,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1661,6 +1677,7 @@ static struct of_device_id const bcm963x +@@ -1659,6 +1675,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index 6b996931d9..8bc33f6141 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1561,6 +1561,48 @@ static struct board_info __initdata boar +@@ -1559,6 +1559,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1644,6 +1686,7 @@ static const struct board_info __initcon +@@ -1642,6 +1684,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1734,6 +1777,7 @@ static struct of_device_id const bcm963x +@@ -1732,6 +1775,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index 7530184ca5..d14309fff2 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar +@@ -1526,6 +1526,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -66,7 +66,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1685,6 +1744,7 @@ static const struct board_info __initcon +@@ -1683,6 +1742,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -74,7 +74,7 @@ &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1776,6 +1836,7 @@ static struct of_device_id const bcm963x +@@ -1774,6 +1834,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index e90c01a48a..eefcc88535 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar +@@ -1520,6 +1522,47 @@ static struct board_info __initdata boar }, }, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1742,6 +1785,7 @@ static const struct board_info __initcon +@@ -1740,6 +1783,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1834,6 +1878,7 @@ static struct of_device_id const bcm963x +@@ -1832,6 +1876,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index 290980b387..9008a23869 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar +@@ -1523,6 +1523,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1785,6 +1838,7 @@ static const struct board_info __initcon +@@ -1783,6 +1836,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1878,6 +1932,7 @@ static struct of_device_id const bcm963x +@@ -1876,6 +1930,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index 4a77754079..61b4ffa7d2 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar +@@ -1576,6 +1576,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1839,6 +1892,7 @@ static const struct board_info __initcon +@@ -1837,6 +1890,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1933,6 +1987,7 @@ static struct of_device_id const bcm963x +@@ -1931,6 +1985,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index fd8eaba28e..1b2df993b8 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1532,6 +1532,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1891,6 +1933,7 @@ static const struct board_info __initcon +@@ -1889,6 +1931,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -1989,6 +2032,7 @@ static struct of_device_id const bcm963x +@@ -1987,6 +2030,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index 6cd061cd3d..65f4c4ddb8 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar +@@ -1234,6 +1234,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1919,6 +1949,7 @@ static const struct board_info __initcon +@@ -1917,6 +1947,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2009,6 +2040,7 @@ static struct of_device_id const bcm963x +@@ -2007,6 +2038,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index df7621dbf8..ece490b66a 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1901,6 +1944,7 @@ static const struct board_info __initcon +@@ -1899,6 +1942,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -1986,6 +2030,7 @@ static struct of_device_id const bcm963x +@@ -1984,6 +2028,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 0e775f891b..7490c55df9 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -73,7 +73,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1938,6 +2004,7 @@ static const struct board_info __initcon +@@ -1936,6 +2002,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -81,7 +81,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2028,6 +2095,7 @@ static struct of_device_id const bcm963x +@@ -2026,6 +2093,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index e8bdf24983..a6863aaeaf 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar +@@ -1662,6 +1662,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2075,6 +2099,7 @@ static const struct board_info __initcon +@@ -2073,6 +2097,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2177,6 +2202,7 @@ static struct of_device_id const bcm963x +@@ -2175,6 +2200,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index 470cbbfb7d..a3d26eb9ec 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar +@@ -1343,6 +1343,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2084,6 +2109,7 @@ static const struct board_info __initcon +@@ -2082,6 +2107,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2191,6 +2217,7 @@ static struct of_device_id const bcm963x +@@ -2189,6 +2215,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index 83c9cbedb6..a742e33528 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar +@@ -1711,6 +1711,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2126,6 +2172,7 @@ static const struct board_info __initcon +@@ -2124,6 +2170,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2229,6 +2276,7 @@ static struct of_device_id const bcm963x +@@ -2227,6 +2274,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index 34c74831a2..4a641d2a19 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2100,6 +2138,7 @@ static const struct board_info __initcon +@@ -2098,6 +2136,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -53,7 +53,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2194,6 +2233,7 @@ static struct of_device_id const bcm963x +@@ -2192,6 +2231,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 27195ddd45..3b5d2f6cde 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar +@@ -1943,6 +1943,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2215,6 +2268,7 @@ static const struct board_info __initcon +@@ -2213,6 +2266,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2315,6 +2369,7 @@ static struct of_device_id const bcm963x +@@ -2313,6 +2367,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index 6d8aedb7dc..9786811210 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2202,6 +2246,7 @@ static const struct board_info __initcon +@@ -2200,6 +2244,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2297,6 +2342,7 @@ static struct of_device_id const bcm963x +@@ -2295,6 +2340,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index 5842addf14..78747d5c12 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar +@@ -1839,6 +1839,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2309,6 +2355,7 @@ static const struct board_info __initcon +@@ -2307,6 +2353,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2417,6 +2464,7 @@ static struct of_device_id const bcm963x +@@ -2415,6 +2462,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 9ed32020e2..a1de2675b7 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar +@@ -1793,6 +1793,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2355,6 +2392,7 @@ static const struct board_info __initcon +@@ -2353,6 +2390,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -52,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2467,6 +2505,7 @@ static struct of_device_id const bcm963x +@@ -2465,6 +2503,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index 29e97108ed..f52e652369 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar +@@ -1693,6 +1693,48 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -49,7 +49,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2389,6 +2431,7 @@ static const struct board_info __initcon +@@ -2387,6 +2429,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -57,7 +57,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2496,6 +2539,7 @@ static struct of_device_id const bcm963x +@@ -2494,6 +2537,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 36c6c14aa3..580dd7eb6c 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar +@@ -2165,6 +2165,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2439,6 +2539,7 @@ static const struct board_info __initcon +@@ -2437,6 +2537,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2550,6 +2651,7 @@ static struct of_device_id const bcm963x +@@ -2548,6 +2649,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index 23b8c78901..68407a3474 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar +@@ -2015,6 +2015,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2539,6 +2562,7 @@ static const struct board_info __initcon +@@ -2537,6 +2560,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2640,6 +2664,7 @@ static struct of_device_id const bcm963x +@@ -2638,6 +2662,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 40235fb21b..76a18106cf 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -66,7 +66,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2482,6 +2541,7 @@ static const struct board_info __initcon +@@ -2480,6 +2539,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -74,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2584,6 +2644,7 @@ static struct of_device_id const bcm963x +@@ -2582,6 +2642,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index c07ebac189..344b2e11f8 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -72,7 +72,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2547,6 +2612,7 @@ static const struct board_info __initcon +@@ -2545,6 +2610,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -80,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2658,6 +2724,8 @@ static struct of_device_id const bcm963x +@@ -2656,6 +2722,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 6a09e1abc6..ac70d4798a 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2594,6 +2594,42 @@ static struct board_info __initdata boar +@@ -2592,6 +2592,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2699,6 +2735,7 @@ static const struct board_info __initcon +@@ -2697,6 +2733,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2812,6 +2849,7 @@ static struct of_device_id const bcm963x +@@ -2810,6 +2847,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 37e946a6ef..1d13e670d4 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2553,6 +2553,41 @@ static struct board_info __initdata boar +@@ -2551,6 +2551,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2734,6 +2769,7 @@ static const struct board_info __initcon +@@ -2732,6 +2767,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -50,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2848,6 +2884,7 @@ static struct of_device_id const bcm963x +@@ -2846,6 +2882,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 9f2e7eaf29..6bb1ab204d 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar +@@ -1781,6 +1781,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2748,6 +2772,7 @@ static const struct board_info __initcon +@@ -2746,6 +2770,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -39,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2862,6 +2887,7 @@ static struct of_device_id const bcm963x +@@ -2860,6 +2885,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index 61ef47e15d..ab84a5adf0 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2577,6 +2577,31 @@ static struct board_info __initdata boar +@@ -2575,6 +2575,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2794,6 +2819,7 @@ static const struct board_info __initcon +@@ -2792,6 +2817,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2910,6 +2936,7 @@ static struct of_device_id const bcm963x +@@ -2908,6 +2934,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index 8ff84c04b2..07c1a93cc4 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar +@@ -1835,6 +1835,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2799,6 +2830,7 @@ static const struct board_info __initcon +@@ -2797,6 +2828,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2913,6 +2945,7 @@ static struct of_device_id const bcm963x +@@ -2911,6 +2943,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index ea373ca935..7b84ebd9de 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2768,6 +2811,7 @@ static const struct board_info __initcon +@@ -2766,6 +2809,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2873,6 +2917,7 @@ static struct of_device_id const bcm963x +@@ -2871,6 +2915,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index cb7abb3966..0ee8619ee5 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2788,6 +2788,36 @@ static struct board_info __initdata boar +@@ -2786,6 +2786,36 @@ static struct board_info __initdata boar }, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2899,6 +2929,7 @@ static const struct board_info __initcon +@@ -2897,6 +2927,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3017,6 +3048,8 @@ static struct of_device_id const bcm963x +@@ -3015,6 +3046,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From fb589b61420ccc6542e796a99a05a0a620e93bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 10:11:01 +0200 Subject: [PATCH 41/45] bcm63xx: add missing OHCI nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All boards with EHCI enabled should also have OHCI enabled. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch | 7 ++++--- .../bcm63xx/patches-5.4/537-board_96318ref_p300.patch | 7 ++++--- .../linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch | 7 ++++--- target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch | 6 +++--- .../bcm63xx/patches-5.4/541-board_963268gu_p300.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch | 6 +++--- .../bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/546-board_hw520.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch | 6 +++--- .../bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/555-board_HG622.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/562-board_sr102.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch | 6 +++--- .../567-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 6 +++--- target/linux/bcm63xx/patches-5.4/568-board-H500s.patch | 6 +++--- 33 files changed, 102 insertions(+), 99 deletions(-) diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index 66e32ef47a..4695547738 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -50,6 +50,52 @@ static struct board_info __initdata boar +@@ -50,6 +50,53 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_3368 */ /* @@ -12,6 +12,7 @@ + .expected_cpu_id = 0x6318, + + .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, + .num_usbh_ports = 1, + @@ -53,7 +54,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1427,6 +1473,9 @@ static const struct board_info __initcon +@@ -1427,6 +1474,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -63,7 +64,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1501,6 +1550,9 @@ static struct of_device_id const bcm963x +@@ -1501,6 +1551,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index d5248fd02c..d585759707 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -93,6 +93,47 @@ static struct board_info __initdata boar +@@ -94,6 +94,48 @@ static struct board_info __initdata boar }, }, }; @@ -10,6 +10,7 @@ + .expected_cpu_id = 0x6318, + + .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, + .num_usbh_ports = 1, + @@ -48,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1475,6 +1516,7 @@ static const struct board_info __initcon +@@ -1476,6 +1518,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -56,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1552,6 +1594,7 @@ static struct of_device_id const bcm963x +@@ -1553,6 +1596,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index 1b5f117739..d7a3484a3b 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1508,6 +1508,45 @@ static struct board_info __initdata boar +@@ -1510,6 +1510,46 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -12,6 +12,7 @@ + .expected_cpu_id = 0x63268, + + .has_pci = 1, ++ .has_ohci0 = 1, + .has_ehci0 = 1, + + .has_enetsw = 1, @@ -46,7 +47,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1585,6 +1624,9 @@ static const struct board_info __initcon +@@ -1587,6 +1627,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -56,7 +57,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1672,6 +1714,7 @@ static struct of_device_id const bcm963x +@@ -1674,6 +1717,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index 51a71cae7e..07594670b1 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -633,6 +633,21 @@ static struct board_info __initdata boar +@@ -635,6 +635,21 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { .name = "V2110", -@@ -1598,6 +1613,7 @@ static const struct board_info __initcon +@@ -1601,6 +1616,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1659,6 +1675,7 @@ static struct of_device_id const bcm963x +@@ -1662,6 +1678,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index 8bc33f6141..34305061fc 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1559,6 +1559,48 @@ static struct board_info __initdata boar +@@ -1562,6 +1562,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1642,6 +1684,7 @@ static const struct board_info __initcon +@@ -1645,6 +1687,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1732,6 +1775,7 @@ static struct of_device_id const bcm963x +@@ -1735,6 +1778,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index d14309fff2..3ac749e00b 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1526,6 +1526,65 @@ static struct board_info __initdata boar +@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -66,7 +66,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1683,6 +1742,7 @@ static const struct board_info __initcon +@@ -1686,6 +1745,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -74,7 +74,7 @@ &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1774,6 +1834,7 @@ static struct of_device_id const bcm963x +@@ -1777,6 +1837,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index eefcc88535..0a76ae16f3 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1520,6 +1522,47 @@ static struct board_info __initdata boar +@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar }, }, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1740,6 +1783,7 @@ static const struct board_info __initcon +@@ -1743,6 +1786,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1832,6 +1876,7 @@ static struct of_device_id const bcm963x +@@ -1835,6 +1879,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index 9008a23869..d81264f4e3 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1523,6 +1523,59 @@ static struct board_info __initdata boar +@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1783,6 +1836,7 @@ static const struct board_info __initcon +@@ -1786,6 +1839,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1876,6 +1930,7 @@ static struct of_device_id const bcm963x +@@ -1879,6 +1933,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index 61b4ffa7d2..c62ee0e67b 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1576,6 +1576,59 @@ static struct board_info __initdata boar +@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1837,6 +1890,7 @@ static const struct board_info __initcon +@@ -1840,6 +1893,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1931,6 +1985,7 @@ static struct of_device_id const bcm963x +@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index 1b2df993b8..285703be70 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1532,6 +1532,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1889,6 +1931,7 @@ static const struct board_info __initcon +@@ -1892,6 +1934,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -1987,6 +2030,7 @@ static struct of_device_id const bcm963x +@@ -1990,6 +2033,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index 65f4c4ddb8..59601ebac5 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1234,6 +1234,36 @@ static struct board_info __initdata boar +@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1917,6 +1947,7 @@ static const struct board_info __initcon +@@ -1920,6 +1950,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2007,6 +2038,7 @@ static struct of_device_id const bcm963x +@@ -2010,6 +2041,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index ece490b66a..2655064454 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -341,6 +341,49 @@ static struct board_info __initdata boar +@@ -343,6 +343,49 @@ static struct board_info __initdata boar }, }; @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1899,6 +1942,7 @@ static const struct board_info __initcon +@@ -1902,6 +1945,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -1984,6 +2028,7 @@ static struct of_device_id const bcm963x +@@ -1987,6 +2031,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 7490c55df9..5b739ebe64 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -136,6 +136,72 @@ static struct board_info __initdata boar +@@ -138,6 +138,72 @@ static struct board_info __initdata boar }, }, }; @@ -73,7 +73,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1936,6 +2002,7 @@ static const struct board_info __initcon +@@ -1939,6 +2005,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -81,7 +81,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2026,6 +2093,7 @@ static struct of_device_id const bcm963x +@@ -2029,6 +2096,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index a6863aaeaf..c355cfbccf 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1662,6 +1662,30 @@ static struct board_info __initdata boar +@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2073,6 +2097,7 @@ static const struct board_info __initcon +@@ -2076,6 +2100,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2175,6 +2200,7 @@ static struct of_device_id const bcm963x +@@ -2178,6 +2203,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index a3d26eb9ec..d06a4c5dab 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1343,6 +1343,31 @@ static struct board_info __initdata boar +@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2082,6 +2107,7 @@ static const struct board_info __initcon +@@ -2085,6 +2110,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2189,6 +2215,7 @@ static struct of_device_id const bcm963x +@@ -2192,6 +2218,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index a742e33528..cc298851a6 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1711,6 +1711,52 @@ static struct board_info __initdata boar +@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2124,6 +2170,7 @@ static const struct board_info __initcon +@@ -2127,6 +2173,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2227,6 +2274,7 @@ static struct of_device_id const bcm963x +@@ -2230,6 +2277,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index 4a641d2a19..1d83831329 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -202,6 +202,44 @@ static struct board_info __initdata boar +@@ -204,6 +204,44 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), }, }; @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2098,6 +2136,7 @@ static const struct board_info __initcon +@@ -2101,6 +2139,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -53,7 +53,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2192,6 +2231,7 @@ static struct of_device_id const bcm963x +@@ -2195,6 +2234,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 3b5d2f6cde..75500a550c 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1943,6 +1943,59 @@ static struct board_info __initdata boar +@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2213,6 +2266,7 @@ static const struct board_info __initcon +@@ -2216,6 +2269,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2313,6 +2367,7 @@ static struct of_device_id const bcm963x +@@ -2316,6 +2370,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index 9786811210..75ec8ec516 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -610,6 +610,50 @@ static struct board_info __initdata boar +@@ -612,6 +612,50 @@ static struct board_info __initdata boar }, }, }; @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2200,6 +2244,7 @@ static const struct board_info __initcon +@@ -2203,6 +2247,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2295,6 +2340,7 @@ static struct of_device_id const bcm963x +@@ -2298,6 +2343,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index 78747d5c12..54484bfaff 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1839,6 +1839,52 @@ static struct board_info __initdata boar +@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2307,6 +2353,7 @@ static const struct board_info __initcon +@@ -2310,6 +2356,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2415,6 +2462,7 @@ static struct of_device_id const bcm963x +@@ -2418,6 +2465,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index a1de2675b7..485da4d66c 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1793,6 +1793,43 @@ static struct board_info __initdata boar +@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2353,6 +2390,7 @@ static const struct board_info __initcon +@@ -2356,6 +2393,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -52,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2465,6 +2503,7 @@ static struct of_device_id const bcm963x +@@ -2468,6 +2506,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index f52e652369..70edc9e002 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1693,6 +1693,48 @@ static struct board_info __initdata boar +@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -49,7 +49,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2387,6 +2429,7 @@ static const struct board_info __initcon +@@ -2390,6 +2432,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -57,7 +57,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2494,6 +2537,7 @@ static struct of_device_id const bcm963x +@@ -2497,6 +2540,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 580dd7eb6c..56f8498289 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2165,6 +2165,106 @@ static struct board_info __initdata boar +@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2437,6 +2537,7 @@ static const struct board_info __initcon +@@ -2440,6 +2540,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2548,6 +2649,7 @@ static struct of_device_id const bcm963x +@@ -2551,6 +2652,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index 68407a3474..9e40de2002 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2015,6 +2015,29 @@ static struct board_info __initdata boar +@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2537,6 +2560,7 @@ static const struct board_info __initcon +@@ -2540,6 +2563,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2638,6 +2662,7 @@ static struct of_device_id const bcm963x +@@ -2641,6 +2665,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 76a18106cf..43b8c38dc0 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -137,6 +137,65 @@ static struct board_info __initdata boar +@@ -139,6 +139,65 @@ static struct board_info __initdata boar }, }; @@ -66,7 +66,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2480,6 +2539,7 @@ static const struct board_info __initcon +@@ -2483,6 +2542,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -74,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2582,6 +2642,7 @@ static struct of_device_id const bcm963x +@@ -2585,6 +2645,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index 344b2e11f8..4e387c1d7d 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -345,6 +345,71 @@ static struct board_info __initdata boar +@@ -347,6 +347,71 @@ static struct board_info __initdata boar }, }; @@ -72,7 +72,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2545,6 +2610,7 @@ static const struct board_info __initcon +@@ -2548,6 +2613,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -80,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2656,6 +2722,8 @@ static struct of_device_id const bcm963x +@@ -2659,6 +2725,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index ac70d4798a..5b3cd50ea6 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2592,6 +2592,42 @@ static struct board_info __initdata boar +@@ -2595,6 +2595,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2697,6 +2733,7 @@ static const struct board_info __initcon +@@ -2700,6 +2736,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2810,6 +2847,7 @@ static struct of_device_id const bcm963x +@@ -2813,6 +2850,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 1d13e670d4..18dcd2a227 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2551,6 +2551,41 @@ static struct board_info __initdata boar +@@ -2554,6 +2554,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2732,6 +2767,7 @@ static const struct board_info __initcon +@@ -2735,6 +2770,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -50,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2846,6 +2882,7 @@ static struct of_device_id const bcm963x +@@ -2849,6 +2885,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 6bb1ab204d..73d921eba4 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1781,6 +1781,30 @@ static struct board_info __initdata boar +@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2746,6 +2770,7 @@ static const struct board_info __initcon +@@ -2749,6 +2773,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -39,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2860,6 +2885,7 @@ static struct of_device_id const bcm963x +@@ -2863,6 +2888,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index ab84a5adf0..426c500068 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2575,6 +2575,31 @@ static struct board_info __initdata boar +@@ -2578,6 +2578,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2792,6 +2817,7 @@ static const struct board_info __initcon +@@ -2795,6 +2820,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2908,6 +2934,7 @@ static struct of_device_id const bcm963x +@@ -2911,6 +2937,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index 07c1a93cc4..66d93ebdac 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1835,6 +1835,37 @@ static struct board_info __initdata boar +@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2797,6 +2828,7 @@ static const struct board_info __initcon +@@ -2800,6 +2831,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2911,6 +2943,7 @@ static struct of_device_id const bcm963x +@@ -2914,6 +2946,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index 7b84ebd9de..e03a3caf0c 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -612,6 +612,49 @@ static struct board_info __initdata boar +@@ -614,6 +614,49 @@ static struct board_info __initdata boar }, }; @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2766,6 +2809,7 @@ static const struct board_info __initcon +@@ -2769,6 +2812,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2871,6 +2915,7 @@ static struct of_device_id const bcm963x +@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index 0ee8619ee5..fded12372d 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2786,6 +2786,36 @@ static struct board_info __initdata boar +@@ -2789,6 +2789,36 @@ static struct board_info __initdata boar }, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2897,6 +2927,7 @@ static const struct board_info __initcon +@@ -2900,6 +2930,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3015,6 +3046,8 @@ static struct of_device_id const bcm963x +@@ -3018,6 +3049,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From eddf8636504466c7e43497a1a59e4bc59dfdb8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 10:22:44 +0200 Subject: [PATCH 42/45] bcm63xx: add missing fallback SPROMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A couple of SPROM IDs are missing. Signed-off-by: Álvaro Fernández Rojas --- .../bcm63xx/patches-5.4/552-board_fast2704n.patch | 11 ++++++++--- .../bcm63xx/patches-5.4/553-board_VR-3026e.patch | 6 +++--- .../bcm63xx/patches-5.4/554-board_R5010UNv2.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/555-board_HG622.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/556-board_EVG2000.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/557-board_AV4202N.patch | 7 ++++--- .../linux/bcm63xx/patches-5.4/558-board_VH4032N.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/559-board_R1000H.patch | 6 +++--- .../bcm63xx/patches-5.4/560-board_AR-5315u.patch | 4 ++-- .../linux/bcm63xx/patches-5.4/561-board_AD1018.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/562-board_sr102.patch | 6 +++--- .../bcm63xx/patches-5.4/563-board-VR-3032u.patch | 6 +++--- .../bcm63xx/patches-5.4/564-board-DGND3700v2.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/565-board-VG-8050.patch | 6 +++--- .../bcm63xx/patches-5.4/566-board-HG253s-v2.patch | 6 +++--- .../567-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 6 +++--- .../linux/bcm63xx/patches-5.4/568-board-H500s.patch | 6 +++--- 17 files changed, 56 insertions(+), 50 deletions(-) diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index 1d83831329..e7b6a21fb2 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -204,6 +204,44 @@ static struct board_info __initdata boar +@@ -204,6 +204,49 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), }, }; @@ -41,11 +41,16 @@ + }, + + .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM43217, ++ .pci_bus = 1, ++ .pci_dev = 0, ++ }, +}; #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2101,6 +2139,7 @@ static const struct board_info __initcon +@@ -2101,6 +2144,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -53,7 +58,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2195,6 +2234,7 @@ static struct of_device_id const bcm963x +@@ -2195,6 +2239,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 75500a550c..3753815585 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar +@@ -1950,6 +1950,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2216,6 +2269,7 @@ static const struct board_info __initcon +@@ -2221,6 +2274,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2316,6 +2370,7 @@ static struct of_device_id const bcm963x +@@ -2321,6 +2375,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index 75ec8ec516..bf60aa0200 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -612,6 +612,50 @@ static struct board_info __initdata boar +@@ -617,6 +617,50 @@ static struct board_info __initdata boar }, }, }; @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2203,6 +2247,7 @@ static const struct board_info __initcon +@@ -2208,6 +2252,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2298,6 +2343,7 @@ static struct of_device_id const bcm963x +@@ -2303,6 +2348,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index 54484bfaff..c279210f2d 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar +@@ -1846,6 +1846,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2310,6 +2356,7 @@ static const struct board_info __initcon +@@ -2315,6 +2361,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2418,6 +2465,7 @@ static struct of_device_id const bcm963x +@@ -2423,6 +2470,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 485da4d66c..51e6faf09b 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar +@@ -1800,6 +1800,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2356,6 +2393,7 @@ static const struct board_info __initcon +@@ -2361,6 +2398,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -52,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2468,6 +2506,7 @@ static struct of_device_id const bcm963x +@@ -2473,6 +2511,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index 70edc9e002..e8e891be99 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar +@@ -1700,6 +1700,49 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -41,6 +41,7 @@ + + .use_fallback_sprom = 1, + .fallback_sprom = { ++ .type = SPROM_BCM4322, + .pci_bus = 0, + .pci_dev = 1, + }, @@ -49,7 +50,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2390,6 +2432,7 @@ static const struct board_info __initcon +@@ -2395,6 +2438,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -57,7 +58,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2497,6 +2540,7 @@ static struct of_device_id const bcm963x +@@ -2502,6 +2546,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 56f8498289..19f9ef73f7 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar +@@ -2173,6 +2173,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2440,6 +2540,7 @@ static const struct board_info __initcon +@@ -2446,6 +2546,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2551,6 +2652,7 @@ static struct of_device_id const bcm963x +@@ -2557,6 +2658,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index 9e40de2002..ae1a748ae7 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar +@@ -2023,6 +2023,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2540,6 +2563,7 @@ static const struct board_info __initcon +@@ -2546,6 +2569,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2641,6 +2665,7 @@ static struct of_device_id const bcm963x +@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 43b8c38dc0..640ee59ec3 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -66,7 +66,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2483,6 +2542,7 @@ static const struct board_info __initcon +@@ -2489,6 +2548,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -74,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2585,6 +2645,7 @@ static struct of_device_id const bcm963x +@@ -2591,6 +2651,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index 4e387c1d7d..28a0a7b468 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -347,6 +347,71 @@ static struct board_info __initdata boar +@@ -352,6 +352,71 @@ static struct board_info __initdata boar }, }; @@ -72,7 +72,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2548,6 +2613,7 @@ static const struct board_info __initcon +@@ -2554,6 +2619,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -80,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2659,6 +2725,8 @@ static struct of_device_id const bcm963x +@@ -2665,6 +2731,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 5b3cd50ea6..6c9a05c9d8 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2595,6 +2595,42 @@ static struct board_info __initdata boar +@@ -2601,6 +2601,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2700,6 +2736,7 @@ static const struct board_info __initcon +@@ -2706,6 +2742,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2813,6 +2850,7 @@ static struct of_device_id const bcm963x +@@ -2819,6 +2856,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 18dcd2a227..5df94067a9 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2554,6 +2554,41 @@ static struct board_info __initdata boar +@@ -2560,6 +2560,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2735,6 +2770,7 @@ static const struct board_info __initcon +@@ -2741,6 +2776,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -50,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2849,6 +2885,7 @@ static struct of_device_id const bcm963x +@@ -2855,6 +2891,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 73d921eba4..74739baf9f 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar +@@ -1788,6 +1788,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2749,6 +2773,7 @@ static const struct board_info __initcon +@@ -2755,6 +2779,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -39,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2863,6 +2888,7 @@ static struct of_device_id const bcm963x +@@ -2869,6 +2894,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index 426c500068..0cf2fbb324 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2578,6 +2578,31 @@ static struct board_info __initdata boar +@@ -2584,6 +2584,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2795,6 +2820,7 @@ static const struct board_info __initcon +@@ -2801,6 +2826,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2911,6 +2937,7 @@ static struct of_device_id const bcm963x +@@ -2917,6 +2943,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index 66d93ebdac..8fd559fdb9 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar +@@ -1842,6 +1842,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2800,6 +2831,7 @@ static const struct board_info __initcon +@@ -2806,6 +2837,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2914,6 +2946,7 @@ static struct of_device_id const bcm963x +@@ -2920,6 +2952,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index e03a3caf0c..04d70d59ac 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -614,6 +614,49 @@ static struct board_info __initdata boar +@@ -619,6 +619,49 @@ static struct board_info __initdata boar }, }; @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2769,6 +2812,7 @@ static const struct board_info __initcon +@@ -2775,6 +2818,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x +@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index fded12372d..c719ef556a 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2789,6 +2789,36 @@ static struct board_info __initdata boar +@@ -2795,6 +2795,36 @@ static struct board_info __initdata boar }, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2900,6 +2930,7 @@ static const struct board_info __initcon +@@ -2906,6 +2936,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3018,6 +3049,8 @@ static struct of_device_id const bcm963x +@@ -3024,6 +3055,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From 0c109df7f02723b3cc59700ef15c1d19e0bcd0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 10:30:07 +0200 Subject: [PATCH 43/45] bcm63xx: merge RTA770BW and RTA770W board patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only difference between both boards is the DSL annex. Signed-off-by: Álvaro Fernández Rojas --- ...patch => 531-board_rta770bw_rta770w.patch} | 9 ++-- .../bcm63xx/patches-5.4/532-board_hw556.patch | 2 +- .../patches-5.4/533-board_rta770w.patch | 43 ------------------- .../patches-5.4/534-board_fast2704.patch | 4 +- .../patches-5.4/535-board_fast2504n.patch | 6 +-- .../patches-5.4/536-board_96318ref.patch | 4 +- .../patches-5.4/537-board_96318ref_p300.patch | 4 +- .../patches-5.4/538-board_bcm963269bhr.patch | 6 +-- .../patches-5.4/539-board_AR1004G.patch | 6 +-- .../patches-5.4/540-board_vw6339gu.patch | 6 +-- .../patches-5.4/541-board_963268gu_p300.patch | 6 +-- .../patches-5.4/542-board_WAP-5813n.patch | 6 +-- .../patches-5.4/543-board_VR-3025u.patch | 6 +-- .../patches-5.4/544-board_VR-3025un.patch | 6 +-- .../patches-5.4/545-board_P870HW-51a_v2.patch | 6 +-- .../bcm63xx/patches-5.4/546-board_hw520.patch | 6 +-- .../patches-5.4/547-board_A4001N.patch | 4 +- .../patches-5.4/548-board_dsl-2751b_e1.patch | 4 +- .../549-board_DGND3700v1_3800B.patch | 6 +-- .../patches-5.4/550-board_homehub2a.patch | 6 +-- .../patches-5.4/551-board_HG655b.patch | 6 +-- .../patches-5.4/552-board_fast2704n.patch | 4 +- .../patches-5.4/553-board_VR-3026e.patch | 6 +-- .../patches-5.4/554-board_R5010UNv2.patch | 4 +- .../bcm63xx/patches-5.4/555-board_HG622.patch | 6 +-- .../patches-5.4/556-board_EVG2000.patch | 6 +-- .../patches-5.4/557-board_AV4202N.patch | 6 +-- .../patches-5.4/558-board_VH4032N.patch | 6 +-- .../patches-5.4/559-board_R1000H.patch | 6 +-- .../patches-5.4/560-board_AR-5315u.patch | 4 +- .../patches-5.4/561-board_AD1018.patch | 4 +- .../bcm63xx/patches-5.4/562-board_sr102.patch | 6 +-- .../patches-5.4/563-board-VR-3032u.patch | 6 +-- .../patches-5.4/564-board-DGND3700v2.patch | 6 +-- .../patches-5.4/565-board-VG-8050.patch | 6 +-- .../patches-5.4/566-board-HG253s-v2.patch | 6 +-- ...67-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 4 +- .../bcm63xx/patches-5.4/568-board-H500s.patch | 6 +-- 38 files changed, 101 insertions(+), 143 deletions(-) rename target/linux/bcm63xx/patches-5.4/{531-board_rta770bw.patch => 531-board_rta770bw_rta770w.patch} (76%) delete mode 100644 target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch similarity index 76% rename from target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch rename to target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch index 2d3e39b50a..dcf5320121 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch @@ -5,7 +5,7 @@ .expected_cpu_id = 0x6345, }; + -+static struct board_info __initdata board_rta770bw = { ++static struct board_info __initdata board_rta770w = { + .name = "RTA770BW", + .expected_cpu_id = 0x6345, + @@ -24,15 +24,16 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -+ &board_rta770bw, ++ &board_rta770w, #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1323,6 +1337,7 @@ static struct of_device_id const bcm963x +@@ -1323,6 +1337,8 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, -+ { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, ++ { .compatible = "dynalink,rta770bw", .data = &board_rta770w, }, ++ { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch index deab307319..49d2858c7d 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -113,7 +113,7 @@ &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1374,6 +1466,9 @@ static struct of_device_id const bcm963x +@@ -1375,6 +1467,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch deleted file mode 100644 index ce6cda7721..0000000000 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -420,6 +420,24 @@ static struct board_info __initdata boar - .force_duplex_full = 1, - }, - }; -+ -+// Actually this board is the very same as the rta770bw, -+// where the additional 'b' within the name just -+// just indicates 'Annex B'. The ADSL Modem itself is able -+// to handle both Annex A as well as Annex B - -+// the loaded firmware makes the only difference -+static struct board_info __initdata board_rta770w = { -+ .name = "RTA770W", -+ .expected_cpu_id = 0x6345, -+ -+ .has_enet0 = 1, -+ .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+}; - #endif /* CONFIG_BCM63XX_CPU_6345 */ - - /* -@@ -1359,6 +1377,7 @@ static const struct board_info __initcon - #ifdef CONFIG_BCM63XX_CPU_6345 - &board_96345gw2, - &board_rta770bw, -+ &board_rta770w, - #endif /* CONFIG_BCM63XX_CPU_6345 */ - #ifdef CONFIG_BCM63XX_CPU_6348 - &board_96348r, -@@ -1430,6 +1449,7 @@ static struct of_device_id const bcm963x - #ifdef CONFIG_BCM63XX_CPU_6345 - { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, - { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, -+ { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, - #endif - #ifdef CONFIG_BCM63XX_CPU_6348 - { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch index fde3b601f6..6071c8bbdd 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1367,6 +1403,7 @@ static const struct board_info __initcon +@@ -1349,6 +1385,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -63,7 +63,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1439,6 +1476,7 @@ static struct of_device_id const bcm963x +@@ -1420,6 +1457,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch index 5974e9a159..13063604a7 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1306,6 +1306,37 @@ static struct board_info __initdata boar +@@ -1288,6 +1288,37 @@ static struct board_info __initdata boar }, }, }; @@ -44,7 +44,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1457,6 +1488,7 @@ static const struct board_info __initcon +@@ -1438,6 +1469,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -52,7 +52,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1537,6 +1569,7 @@ static struct of_device_id const bcm963x +@@ -1518,6 +1550,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index 4695547738..17cf1d1fba 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -54,7 +54,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1427,6 +1474,9 @@ static const struct board_info __initcon +@@ -1409,6 +1456,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -64,7 +64,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1501,6 +1551,9 @@ static struct of_device_id const bcm963x +@@ -1482,6 +1532,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index d585759707..3abb9644c5 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1476,6 +1518,7 @@ static const struct board_info __initcon +@@ -1458,6 +1500,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1553,6 +1596,7 @@ static struct of_device_id const bcm963x +@@ -1534,6 +1577,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index d7a3484a3b..d3b1c79cfd 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1510,6 +1510,46 @@ static struct board_info __initdata boar +@@ -1492,6 +1492,46 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -47,7 +47,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1587,6 +1627,9 @@ static const struct board_info __initcon +@@ -1568,6 +1608,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -57,7 +57,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1674,6 +1717,7 @@ static struct of_device_id const bcm963x +@@ -1655,6 +1698,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index 07594670b1..34cc2555eb 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -635,6 +635,21 @@ static struct board_info __initdata boar +@@ -617,6 +617,21 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { .name = "V2110", -@@ -1601,6 +1616,7 @@ static const struct board_info __initcon +@@ -1582,6 +1597,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1662,6 +1678,7 @@ static struct of_device_id const bcm963x +@@ -1643,6 +1659,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index 34305061fc..4e6ea9dcd9 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1562,6 +1562,48 @@ static struct board_info __initdata boar +@@ -1544,6 +1544,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1645,6 +1687,7 @@ static const struct board_info __initcon +@@ -1626,6 +1668,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1735,6 +1778,7 @@ static struct of_device_id const bcm963x +@@ -1716,6 +1759,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index 3ac749e00b..ec0642d358 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar +@@ -1510,6 +1510,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -66,7 +66,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1686,6 +1745,7 @@ static const struct board_info __initcon +@@ -1667,6 +1726,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -74,7 +74,7 @@ &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1777,6 +1837,7 @@ static struct of_device_id const bcm963x +@@ -1758,6 +1818,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index 0a76ae16f3..9b31e5bca8 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar +@@ -1504,6 +1506,47 @@ static struct board_info __initdata boar }, }, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1743,6 +1786,7 @@ static const struct board_info __initcon +@@ -1724,6 +1767,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1835,6 +1879,7 @@ static struct of_device_id const bcm963x +@@ -1816,6 +1860,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index d81264f4e3..a12ff5f29d 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar +@@ -1507,6 +1507,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1786,6 +1839,7 @@ static const struct board_info __initcon +@@ -1767,6 +1820,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1879,6 +1933,7 @@ static struct of_device_id const bcm963x +@@ -1860,6 +1914,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index c62ee0e67b..095c96be7b 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar +@@ -1560,6 +1560,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1840,6 +1893,7 @@ static const struct board_info __initcon +@@ -1821,6 +1874,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x +@@ -1915,6 +1969,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index 285703be70..23599a9320 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1516,6 +1516,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1892,6 +1934,7 @@ static const struct board_info __initcon +@@ -1873,6 +1915,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -1990,6 +2033,7 @@ static struct of_device_id const bcm963x +@@ -1971,6 +2014,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index 59601ebac5..a29f9bd573 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar +@@ -1218,6 +1218,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1920,6 +1950,7 @@ static const struct board_info __initcon +@@ -1901,6 +1931,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2010,6 +2041,7 @@ static struct of_device_id const bcm963x +@@ -1991,6 +2022,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index 2655064454..303cdbfd0b 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1902,6 +1945,7 @@ static const struct board_info __initcon +@@ -1884,6 +1927,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -1987,6 +2031,7 @@ static struct of_device_id const bcm963x +@@ -1968,6 +2012,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 5b739ebe64..6b27bf9f5b 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -73,7 +73,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1939,6 +2005,7 @@ static const struct board_info __initcon +@@ -1921,6 +1987,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -81,7 +81,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2029,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2010,6 +2077,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index c355cfbccf..1ceb59db78 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar +@@ -1646,6 +1646,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2076,6 +2100,7 @@ static const struct board_info __initcon +@@ -2057,6 +2081,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2178,6 +2203,7 @@ static struct of_device_id const bcm963x +@@ -2159,6 +2184,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index d06a4c5dab..25d644fa8d 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar +@@ -1327,6 +1327,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2085,6 +2110,7 @@ static const struct board_info __initcon +@@ -2066,6 +2091,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2192,6 +2218,7 @@ static struct of_device_id const bcm963x +@@ -2173,6 +2199,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index cc298851a6..2678534a60 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar +@@ -1695,6 +1695,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2127,6 +2173,7 @@ static const struct board_info __initcon +@@ -2108,6 +2154,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2230,6 +2277,7 @@ static struct of_device_id const bcm963x +@@ -2211,6 +2258,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index e7b6a21fb2..06d8391590 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2101,6 +2144,7 @@ static const struct board_info __initcon +@@ -2083,6 +2126,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -58,7 +58,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2195,6 +2239,7 @@ static struct of_device_id const bcm963x +@@ -2176,6 +2220,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 3753815585..5b9973932b 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1950,6 +1950,59 @@ static struct board_info __initdata boar +@@ -1932,6 +1932,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2221,6 +2274,7 @@ static const struct board_info __initcon +@@ -2202,6 +2255,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2321,6 +2375,7 @@ static struct of_device_id const bcm963x +@@ -2302,6 +2356,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index bf60aa0200..de787cb705 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2208,6 +2252,7 @@ static const struct board_info __initcon +@@ -2190,6 +2234,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2303,6 +2348,7 @@ static struct of_device_id const bcm963x +@@ -2284,6 +2329,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index c279210f2d..13b26fc35e 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1846,6 +1846,52 @@ static struct board_info __initdata boar +@@ -1828,6 +1828,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2315,6 +2361,7 @@ static const struct board_info __initcon +@@ -2296,6 +2342,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2423,6 +2470,7 @@ static struct of_device_id const bcm963x +@@ -2404,6 +2451,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 51e6faf09b..6337419a9a 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1800,6 +1800,43 @@ static struct board_info __initdata boar +@@ -1782,6 +1782,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2361,6 +2398,7 @@ static const struct board_info __initcon +@@ -2342,6 +2379,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -52,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2473,6 +2511,7 @@ static struct of_device_id const bcm963x +@@ -2454,6 +2492,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index e8e891be99..02c48d7d71 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1700,6 +1700,49 @@ static struct board_info __initdata boar +@@ -1682,6 +1682,49 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -50,7 +50,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2395,6 +2438,7 @@ static const struct board_info __initcon +@@ -2376,6 +2419,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -58,7 +58,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2502,6 +2546,7 @@ static struct of_device_id const bcm963x +@@ -2483,6 +2527,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 19f9ef73f7..4de5aff6a8 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2173,6 +2173,106 @@ static struct board_info __initdata boar +@@ -2155,6 +2155,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2446,6 +2546,7 @@ static const struct board_info __initcon +@@ -2427,6 +2527,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2557,6 +2658,7 @@ static struct of_device_id const bcm963x +@@ -2538,6 +2639,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch index ae1a748ae7..570ace245c 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2023,6 +2023,29 @@ static struct board_info __initdata boar +@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2546,6 +2569,7 @@ static const struct board_info __initcon +@@ -2527,6 +2550,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x +@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 640ee59ec3..9315b556b7 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -66,7 +66,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2489,6 +2548,7 @@ static const struct board_info __initcon +@@ -2471,6 +2530,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -74,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2591,6 +2651,7 @@ static struct of_device_id const bcm963x +@@ -2572,6 +2632,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index 28a0a7b468..8c62a9c16d 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -72,7 +72,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2554,6 +2619,7 @@ static const struct board_info __initcon +@@ -2536,6 +2601,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -80,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2665,6 +2731,8 @@ static struct of_device_id const bcm963x +@@ -2646,6 +2712,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 6c9a05c9d8..3ac5aef937 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2601,6 +2601,42 @@ static struct board_info __initdata boar +@@ -2583,6 +2583,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2706,6 +2742,7 @@ static const struct board_info __initcon +@@ -2687,6 +2723,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2819,6 +2856,7 @@ static struct of_device_id const bcm963x +@@ -2800,6 +2837,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 5df94067a9..c40b23fdb8 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2560,6 +2560,41 @@ static struct board_info __initdata boar +@@ -2542,6 +2542,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2741,6 +2776,7 @@ static const struct board_info __initcon +@@ -2722,6 +2757,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -50,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2855,6 +2891,7 @@ static struct of_device_id const bcm963x +@@ -2836,6 +2872,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 74739baf9f..de37a8b709 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1788,6 +1788,30 @@ static struct board_info __initdata boar +@@ -1770,6 +1770,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2755,6 +2779,7 @@ static const struct board_info __initcon +@@ -2736,6 +2760,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -39,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2869,6 +2894,7 @@ static struct of_device_id const bcm963x +@@ -2850,6 +2875,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index 0cf2fbb324..fa0cd6aef0 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2584,6 +2584,31 @@ static struct board_info __initdata boar +@@ -2566,6 +2566,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2801,6 +2826,7 @@ static const struct board_info __initcon +@@ -2782,6 +2807,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2917,6 +2943,7 @@ static struct of_device_id const bcm963x +@@ -2898,6 +2924,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index 8fd559fdb9..80ce2d3853 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1842,6 +1842,37 @@ static struct board_info __initdata boar +@@ -1824,6 +1824,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2806,6 +2837,7 @@ static const struct board_info __initcon +@@ -2787,6 +2818,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2920,6 +2952,7 @@ static struct of_device_id const bcm963x +@@ -2901,6 +2933,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index 04d70d59ac..dec14545fe 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2775,6 +2818,7 @@ static const struct board_info __initcon +@@ -2757,6 +2800,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x +@@ -2861,6 +2905,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index c719ef556a..a2c08a78f5 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2795,6 +2795,36 @@ static struct board_info __initdata boar +@@ -2777,6 +2777,36 @@ static struct board_info __initdata boar }, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2906,6 +2936,7 @@ static const struct board_info __initcon +@@ -2887,6 +2917,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3024,6 +3055,8 @@ static struct of_device_id const bcm963x +@@ -3005,6 +3036,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, From 4a6795409d1520fd3da3e909a8bcf9d7fd0927bb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 5 Aug 2020 09:07:00 +0200 Subject: [PATCH 44/45] base-files: functions.sh: fix config_get() on invalid identifiers When passing a section or option value to config_get() which contains characters that happen to be valid variable interpolation expressions, the function returns a nonsensical expression result instead of the expected empty string. When the passed section or option name contains other characters which are not valid within a shell variable name, a substitution error is occuring instead. The issue can be easily reproduced by one of the following examples: root@OpenWrt:~# . /lib/functions.sh root@OpenWrt:~# config load system root@OpenWrt:~# config_get variable invalid-section option root@OpenWrt:~# echo "$variable" section_option:- root@OpenWrt:~# . /lib/functions.sh root@OpenWrt:~# config load system root@OpenWrt:~# config_get variable section invalid-option root@OpenWrt:~# echo "$variable" option:- root@OpenWrt:~# . /lib/functions.sh root@OpenWrt:~# config load system root@OpenWrt:~# config_get variable section invalid@option -ash: eval: syntax error: bad substitution Fix this issue by only performing interpolations when the given section and option arguments are free of illegal characters. Signed-off-by: Jo-Philipp Wich --- package/base-files/Makefile | 2 +- package/base-files/files/lib/functions.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7e0d341705..c3d2aac2bb 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=225 +PKG_RELEASE:=226 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 323e057451..7da0c872fa 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -107,9 +107,14 @@ config_unset() { # config_get