From ebf71533f9123d9ca182154a55af5e2904460a25 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Fri, 14 Aug 2020 18:03:40 +0200 Subject: [PATCH 01/16] ath79: add support for ALLNET ALL-WAP02860AC ALLNET ALL-WAP02860AC is a dual-band wireless access point. Specification SoC: Qualcomm Atheros QCA9558 RAM: 128 MB DDR2 Flash: 16 MB SPI NOR WIFI: 2.4 GHz 3T3R integrated 5 GHz 3T3R QCA9880 Mini PCIe card Ethernet: 1x 10/100/1000 Mbps AR8035-A, PoE capable (802.3at) LEDS: 5x, which four are GPIO controlled Buttons: 1x GPIO controlled UART: 4 pin header near Mini PCIe card, starting count from white triangle on PCB 1. VCC 3.3V, 2. GND, 3. TX, 4. RX baud: 115200, parity: none, flow control: none MAC addresses Calibration data does not contain valid MAC addresses. The calculated MAC addresses are chosen in accordance with OEM firmware. Because of: a) constrained environment (SNMP) when connecting through Telnet or SSH, b) hard-coded kernel and rootfs sizes, c) checksum verification of kerenel and rootfs images in bootloder, creating factory image accepted by OEM web interface is difficult, therefore, to install OpenWrt on this device UART connection is needed. The teardown is simple, unscrew four screws to disassemble the casing, plus two screws to separate mainboard from the casing. Before flashing, be sure to have a copy of factory firmware, in case You wish to revert to original firmware. Installation 1. Prepare TFTP server with OpenWrt initramfs-kernel image. 2. Connect to LAN port. 3. Connect to UART port. 4. Power on the device and when prompted to stop autoboot, hit any key. 5. Alter U-Boot environment with following commands: setenv failsafe_boot bootm 0x9f0a0000 saveenv 6. Adjust "ipaddr" and "serverip" addresses in U-Boot environment, use 'setenv' to do that, then run following commands: tftpboot 0x81000000 bootm 0x81000000 7. Wait about 1 minute for OpenWrt to boot. 8. Transfer OpenWrt sysupgrade image to /tmp directory and flash it with: sysupgrade -n /tmp/ 9. After flashing, the access point will reboot to OpenWrt. Wait few minutes, until the Power LED stops blinking, then it's ready for configuration. Signed-off-by: Tomasz Maciej Nowak [add MAC address comment to commit message] Signed-off-by: Adrian Schmutzler --- package/boot/uboot-envtools/files/ath79 | 1 + .../dts/qca9558_allnet_all-wap02860ac.dts | 156 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 9 +- target/linux/ath79/image/generic.mk | 9 + 5 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index b00e3fa127..c0873c6e0d 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -14,6 +14,7 @@ board=$(board_name) case "$board" in alfa-network,ap121f|\ +allnet,all-wap02860ac|\ arduino,yun|\ buffalo,bhr-4grv2|\ devolo,magic-2-wifi|\ diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts new file mode 100644 index 0000000000..6d7eeb2630 --- /dev/null +++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca955x.dtsi" + +/ { + model = "ALLNET ALL-WAP02860AC"; + compatible = "allnet,all-wap02860ac", "qca,qca9558"; + + aliases { + label-mac-device = ð0; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "all-wap02860ac:amber:power"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + wlan2g { + label = "all-wap02860ac:blue:wlan2g"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + wlan5g { + label = "all-wap02860ac:green:wlan5g"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wps { + label = "all-wap02860ac:blue:wps"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + }; + }; +}; + +ð0 { + status = "okay"; + + pll-data = <0x8e000000 0x80000101 0x80001313>; + phy-handle = <&phy5>; + phy-mode = "rgmii-rxid"; + + mtd-mac-address = <&art 0x0>; +}; + +&mdio0 { + status = "okay"; + + phy5: ethernet-phy@5 { + reg = <5>; + eee-broken-100tx; + eee-broken-1000t; + }; +}; + +&pcie0 { + status = "okay"; + + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + }; +}; + +&pll { + clocks = <&extosc>; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + }; + + partition@50000 { + label = "custom"; + reg = <0x050000 0x050000>; + read-only; + }; + + partition@a0000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x0a0000 0xcd0000>; + }; + + partition@d70000 { + label = "failsafe"; + reg = <0xd70000 0x280000>; + read-only; + }; + + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x010000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&art 0x0>; + mtd-mac-address-increment = <1>; + qca-no-eeprom; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 4195332ae2..f655abe740 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -11,6 +11,7 @@ ath79_setup_interfaces() case "$board" in adtran,bsap1800-v2|\ adtran,bsap1840|\ + allnet,all-wap02860ac|\ alfa-network,ap121f|\ arduino,yun|\ aruba,ap-105|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 19e20c7d36..1c93fe332c 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -10,6 +10,11 @@ board=$(board_name) case "$FIRMWARE" in "ath10k/cal-pci-0000:00:00.0.bin") case $board in + allnet,all-wap02860ac|\ + glinet,gl-x750) + caldata_extract "art" 0x5000 0x844 + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) + ;; avm,fritz1750e|\ avm,fritzdvbc) caldata_extract "urlader" 0x198a 0x844 @@ -72,10 +77,6 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1) ;; - glinet,gl-x750) - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) - ;; nec,wg800hp) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(mtd_get_mac_text board_data 0x880) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index e2c37f7a57..debb6722ca 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -210,6 +210,15 @@ define Device/alfa-network_ap121f endef TARGET_DEVICES += alfa-network_ap121f +define Device/allnet_all-wap02860ac + SOC := qca9558 + DEVICE_VENDOR := ALLNET + DEVICE_MODEL := ALL-WAP02860AC + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct + IMAGE_SIZE := 13120k +endef +TARGET_DEVICES += allnet_all-wap02860ac + define Device/arduino_yun SOC := ar9331 DEVICE_VENDOR := Arduino From 763ce13b0b35892804ce3b1c30b1f69bbc652ec7 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sat, 15 Aug 2020 11:10:22 +0100 Subject: [PATCH 02/16] dropbear: allow disabling support for scp If not needed, disabling scp allows for a nice size reduction. Dropbear executable size comparison: 153621 bytes (baseline) 133077 bytes (without scp) In other words, we trim a total of 20544 bytes. Signed-off-by: Rui Salvaterra --- package/network/services/dropbear/Config.in | 4 ++++ package/network/services/dropbear/Makefile | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 3de4189e08..108b80376b 100644 --- a/package/network/services/dropbear/Config.in +++ b/package/network/services/dropbear/Config.in @@ -95,4 +95,8 @@ config DROPBEAR_DBCLIENT bool "Build dropbear with dbclient" default y +config DROPBEAR_SCP + bool "Build dropbear with scp" + default y + endmenu diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index bedb000fda..1cda98bf7e 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2020.80 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB \ CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_CHACHA20POLY1305 \ CONFIG_DROPBEAR_UTMP CONFIG_DROPBEAR_PUTUTLINE \ - CONFIG_DROPBEAR_DBCLIENT + CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP include $(INCLUDE_DIR)/package.mk @@ -53,7 +53,9 @@ define Package/dropbear CATEGORY:=Base system TITLE:=Small SSH2 client/server DEPENDS:= +DROPBEAR_ZLIB:zlib - ALTERNATIVES:=100:/usr/bin/scp:/usr/sbin/dropbear + ALTERNATIVES:= + $(if $(CONFIG_DROPBEAR_SCP),ALTERNATIVES+= \ + 100:/usr/bin/scp:/usr/sbin/dropbear,) $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \ 100:/usr/bin/ssh:/usr/sbin/dropbear,) @@ -146,7 +148,7 @@ endef define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey scp" \ + PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey $(if $(CONFIG_DROPBEAR_SCP),scp,)" \ MULTI=1 SCPPROGRESS=1 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ From 1e696c6ced1ef99179fa4dbdf32f0a45f56120a0 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Sat, 15 Aug 2020 17:00:15 +0900 Subject: [PATCH 03/16] map: add a legacymap option The legacy map version based on the IPv6 Interface Identifier in draft-ietf-softwire-map-03 was typically used by uncommenting the LEGACY variable in the map.sh file, which is not ideal. A proper configuration option is needed instead. The IPv6 Interface Identifier format described in the draft was eventually changed in RFC7597, but is still used by some major ISPs, including in Japan. Signed-off-by: Remi NGUYEN VAN Signed-off-by: Hans Dedecker [PKG_RELEASE increase] --- package/network/ipv6/map/Makefile | 2 +- package/network/ipv6/map/files/map.sh | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile index 5d0e0bbd3d..4bb29ee57b 100644 --- a/package/network/ipv6/map/Makefile +++ b/package/network/ipv6/map/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/map/files/map.sh b/package/network/ipv6/map/files/map.sh index 6462e810cc..61075bd244 100755 --- a/package/network/ipv6/map/files/map.sh +++ b/package/network/ipv6/map/files/map.sh @@ -25,12 +25,9 @@ proto_map_setup() { local iface="$2" local link="map-$cfg" - # uncomment for legacy MAP0 mode - #export LEGACY=1 - - local type mtu ttl tunlink zone encaplimit + local type legacymap mtu ttl tunlink zone encaplimit local rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset - json_get_vars type mtu ttl tunlink zone encaplimit + json_get_vars type legacymap mtu ttl tunlink zone encaplimit json_get_vars rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset [ "$zone" = "-" ] && zone="" @@ -56,7 +53,7 @@ proto_map_setup() { fi echo "rule=$rule" > /tmp/map-$cfg.rules - RULE_DATA=$(mapcalc ${tunlink:-\*} $rule) + RULE_DATA=$(LEGACY="$legacymap" mapcalc ${tunlink:-\*} $rule) if [ "$?" != 0 ]; then proto_notify_error "$cfg" "INVALID_MAP_RULE" proto_block_restart "$cfg" @@ -106,7 +103,7 @@ proto_map_setup() { elif [ "$type" = "map-t" -a -f "/proc/net/nat46/control" ]; then proto_init_update "$link" 1 local style="MAP" - [ "$LEGACY" = 1 ] && style="MAP0" + [ "$legacymap" = 1 ] && style="MAP0" echo add $link > /proc/net/nat46/control local cfgstr="local.style $style local.v4 $(eval "echo \$RULE_${k}_IPV4PREFIX")/$(eval "echo \$RULE_${k}_PREFIX4LEN")" @@ -229,6 +226,7 @@ proto_map_init_config() { proto_config_add_int "psidlen" proto_config_add_int "psid" proto_config_add_int "offset" + proto_config_add_boolean "legacymap" proto_config_add_string "tunlink" proto_config_add_int "mtu" From d43b963b3d1172fbe7e3f57f88da11e4d7e54c95 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 15 Aug 2020 17:21:35 +0200 Subject: [PATCH 04/16] bcm63xx: reorganize board patches This renames board patches to make finding devices easier and reorders them based on their board. The devices are grouped based on the board/cpu_id. New device patches should be numbered based on their group. Signed-off-by: Adrian Schmutzler --- ...ulate-the-compatible-to-board_info-l.patch} | 2 +- ...> 501-board_bcm6318-brcm-bcm96318ref.patch} | 10 +++++----- ...-board_bcm6318-brcm-bcm96318ref-p300.patch} | 8 ++++---- ...503-board_bcm6318-d-link-dsl-275xb-d.patch} | 8 ++++---- ...> 504-board_bcm6318-sagem-fast-2704n.patch} | 8 ++++---- ... 505-board_bcm6318-comtrend-ar-5315u.patch} | 6 +++--- ...CM63XX-add-96328avng-reference-board.patch} | 2 +- ...CM63XX-add-963281TAN-reference-board.patch} | 10 +++++----- ...523-board_bcm6328-d-link-dsl-274xb-f.patch} | 6 +++--- ...tch => 524-board_bcm6328-adb-a4001n1.patch} | 8 ++++---- ...525-board_bcm6328-comtrend-ar-5387un.patch} | 8 ++++---- ... 526-board_bcm6328-comtrend-ar-5381u.patch} | 8 ++++---- ...527-board_bcm6328-sagem-fast-2704-v2.patch} | 6 +++--- ...atch => 528-board_bcm6328-adb-a4001n.patch} | 8 ++++---- ...> 529-board_bcm6328-nucom-r5010un-v2.patch} | 6 +++--- ... => 530-board_bcm6328-sercomm-ad1018.patch} | 6 +++--- ...-bcm6328-adb-pdg-a4001n-a-000-1a1-ax.patch} | 6 +++--- ...> 541-board-bcm6338-d-link-dsl-2640u.patch} | 6 +++--- ...> 542-board_bcm6338-dynalink-rta1320.patch} | 6 +++--- ...rd_bcm6345-dynalink-rta770bw-rta770w.patch} | 6 +++--- ...D4PW.patch => 561-board-bcm6348-D4PW.patch} | 6 +++--- ...board_bcm6348-t-com-speedport-w-500v.patch} | 6 +++--- ...63-board_bcm6348-tecom-gw6000-gw6200.patch} | 6 +++--- ...ch => 564-board-bcm6348-telsey-magic.patch} | 6 +++--- ...65-board_bcm6348-bt-voyager-2500v-bb.patch} | 8 ++++---- ...=> 566-board_bcm6348-bt-voyager-2110.patch} | 6 +++--- ...BCM63XX-add-inventel-Livebox-support.patch} | 0 ..._bcm6348-comtrend-ct-536plus-ct-5621.patch} | 6 +++--- ...> 569-board_bcm6348-comtrend-ct-5365.patch} | 6 +++--- ...570-board_bcm6348-telsey-cpva502plus.patch} | 6 +++--- ... 571-board_bcm6348-netgear-dg834g-v4.patch} | 6 +++--- ...=> 572-board_bcm6348-sagem-fast-2604.patch} | 6 +++--- ... => 573-board_bcm6348-asmax-ar-1004g.patch} | 6 +++--- ...ch => 601-board-bcm6358-DWV-S0_fixes.patch} | 4 ++-- ...h => 602-board-bcm6358-sfr-neufbox-4.patch} | 8 ++++---- ... => 603-board-bcm6358-telsey-cpva642.patch} | 6 +++--- ...604-board_bcm6358-d-link-dsl-274xb-c.patch} | 8 ++++---- ...-board_bcm6358-huawei-echolife-hg553.patch} | 6 +++--- ...board_bcm6358-t-com-speedport-w-303v.patch} | 6 +++--- ...> 607-board_bcm6358-comtrend-ct-6373.patch} | 6 +++--- ...-board_bcm6358-d-link-dva-g3810bn-tl.patch} | 10 +++++----- ...-board_bcm6358-huawei-echolife-hg556.patch} | 6 +++--- ...board_bcm6359-huawei-echolife-hg520v.patch} | 6 +++--- ...=> 611-board_bcm6358-bt-home-hub-2-a.patch} | 8 ++++---- ...h => 631-board_bcm6361-sfr-neufbox-6.patch} | 18 +++++++++--------- ...> 632-board_bcm6362-sagem-fast-2504n.patch} | 12 ++++++------ ...33-board-bcm6362-netgear-dgnd3700-v2.patch} | 8 ++++---- ...> 634-board-bcm6362-huawei-hg253s-v2.patch} | 10 +++++----- ...63xx-add-support-for-96368MVWG-board.patch} | 16 ++++++++-------- ...3xx-add-support-for-96368MVNgr-board.patch} | 10 +++++----- ...653-board_bcm6369-comtrend-wap-5813n.patch} | 12 ++++++------ ... 654-board_bcm6368-comtrend-vr-3025u.patch} | 8 ++++---- ...655-board_bcm6368-comtrend-vr-3025un.patch} | 8 ++++---- ...56-board_bcm6368-zyxel-p870hw-51a-v2.patch} | 8 ++++---- ...57-board_bcm6368-netgear-dgnd3700-v1.patch} | 6 +++--- ...board_bcm6368-huawei-echolife-hg655b.patch} | 6 +++--- ... 659-board_bcm6368-comtrend-vr-3026e.patch} | 8 ++++---- ...-board_bcm6368-huawei-echolife-hg622.patch} | 6 +++--- ...=> 661-board_bcm6369-netgear-evg2000.patch} | 6 +++--- ...tch => 662-board_bcm6368-adb-av4202n.patch} | 8 ++++---- ...=> 663-board_bcm6368-observa-vh4032n.patch} | 6 +++--- ...> 664-board_bcm6368-actiontec-r1000h.patch} | 6 +++--- ...681-board_bcm63269-brcm-bcm963269bhr.patch} | 12 ++++++------ ...ch => 682-board_bcm63268-inteno-vg50.patch} | 6 +++--- ...board_bcm63268-brcm-bcm963268bu-p300.patch} | 10 +++++----- ...atch => 684-board_bcm63168-sky-sr102.patch} | 6 +++--- ...685-board-bcm63168-comtrend-vr-3032u.patch} | 6 +++--- ... 686-board-bcm63169-comtrend-vg-8050.patch} | 6 +++--- ...=> 687-board-bcm63167-sercomm-h500-s.patch} | 0 69 files changed, 245 insertions(+), 245 deletions(-) rename target/linux/bcm63xx/patches-5.4/{369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch => 500-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch} (97%) rename target/linux/bcm63xx/patches-5.4/{536-board_96318ref.patch => 501-board_bcm6318-brcm-bcm96318ref.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{537-board_96318ref_p300.patch => 502-board_bcm6318-brcm-bcm96318ref-p300.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{548-board_dsl-2751b_e1.patch => 503-board_bcm6318-d-link-dsl-275xb-d.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{552-board_fast2704n.patch => 504-board_bcm6318-sagem-fast-2704n.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{560-board_AR-5315u.patch => 505-board_bcm6318-comtrend-ar-5315u.patch} (91%) rename target/linux/bcm63xx/patches-5.4/{520-MIPS-BCM63XX-add-96328avng-reference-board.patch => 521-MIPS-BCM63XX-add-96328avng-reference-board.patch} (93%) rename target/linux/bcm63xx/patches-5.4/{521-MIPS-BCM63XX-add-963281TAN-reference-board.patch => 522-MIPS-BCM63XX-add-963281TAN-reference-board.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{522-board_dsl_274xb_rev_f.patch => 523-board_bcm6328-d-link-dsl-274xb-f.patch} (90%) rename target/linux/bcm63xx/patches-5.4/{528-board_A4001N1.patch => 524-board_bcm6328-adb-a4001n1.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{529-board_AR-5387un.patch => 525-board_bcm6328-comtrend-ar-5387un.patch} (91%) rename target/linux/bcm63xx/patches-5.4/{530-board_AR-5381u.patch => 526-board_bcm6328-comtrend-ar-5381u.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{534-board_fast2704.patch => 527-board_bcm6328-sagem-fast-2704-v2.patch} (90%) rename target/linux/bcm63xx/patches-5.4/{547-board_A4001N.patch => 528-board_bcm6328-adb-a4001n.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{554-board_R5010UNv2.patch => 529-board_bcm6328-nucom-r5010un-v2.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{561-board_AD1018.patch => 530-board_bcm6328-sercomm-ad1018.patch} (92%) rename target/linux/bcm63xx/patches-5.4/{567-board-adb_pdg-a4001n-a-000-1a1-ax.patch => 531-board-bcm6328-adb-pdg-a4001n-a-000-1a1-ax.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{502-board-96338W2_E7T.patch => 541-board-bcm6338-d-link-dsl-2640u.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{509-board_rta1320_16m.patch => 542-board_bcm6338-dynalink-rta1320.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{531-board_rta770bw_rta770w.patch => 551-board_bcm6345-dynalink-rta770bw-rta770w.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{500-board-D4PW.patch => 561-board-bcm6348-D4PW.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{505-board_spw500v.patch => 562-board_bcm6348-t-com-speedport-w-500v.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{506-board_gw6200_gw6000.patch => 563-board_bcm6348-tecom-gw6000-gw6200.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{507-board-MAGIC.patch => 564-board-bcm6348-telsey-magic.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{511-board_V2500V.patch => 565-board_bcm6348-bt-voyager-2500v-bb.patch} (91%) rename target/linux/bcm63xx/patches-5.4/{512-board_BTV2110.patch => 566-board_bcm6348-bt-voyager-2110.patch} (85%) rename target/linux/bcm63xx/patches-5.4/{513-MIPS-BCM63XX-add-inventel-Livebox-support.patch => 567-MIPS-BCM63XX-add-inventel-Livebox-support.patch} (100%) rename target/linux/bcm63xx/patches-5.4/{514-board_ct536_ct5621.patch => 568-board_bcm6348-comtrend-ct-536plus-ct-5621.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{516-board_96348A-122.patch => 569-board_bcm6348-comtrend-ct-5365.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{517_board_CPVA502plus.patch => 570-board_bcm6348-telsey-cpva502plus.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{523-board_96348w3.patch => 571-board_bcm6348-netgear-dg834g-v4.patch} (85%) rename target/linux/bcm63xx/patches-5.4/{527-board_fast2604.patch => 572-board_bcm6348-sagem-fast-2604.patch} (85%) rename target/linux/bcm63xx/patches-5.4/{539-board_AR1004G.patch => 573-board_bcm6348-asmax-ar-1004g.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{515-board_DWV-S0_fixes.patch => 601-board-bcm6358-DWV-S0_fixes.patch} (59%) rename target/linux/bcm63xx/patches-5.4/{501-board-NB4.patch => 602-board-bcm6358-sfr-neufbox-4.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{503-board-CPVA642.patch => 603-board-bcm6358-telsey-cpva642.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{504-board_dsl_274xb_rev_c.patch => 604-board_bcm6358-d-link-dsl-274xb-c.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{508-board_hw553.patch => 605-board_bcm6358-huawei-echolife-hg553.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{510-board_spw303v.patch => 606-board_bcm6358-t-com-speedport-w-303v.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{524-board_CT6373-1.patch => 607-board_bcm6358-comtrend-ct-6373.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{525-board_dva-g3810bn-tl-1.patch => 608-board_bcm6358-d-link-dva-g3810bn-tl.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{532-board_hw556.patch => 609-board_bcm6358-huawei-echolife-hg556.patch} (93%) rename target/linux/bcm63xx/patches-5.4/{546-board_hw520.patch => 610-board_bcm6359-huawei-echolife-hg520v.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{550-board_homehub2a.patch => 611-board_bcm6358-bt-home-hub-2-a.patch} (81%) rename target/linux/bcm63xx/patches-5.4/{526-board_nb6.patch => 631-board_bcm6361-sfr-neufbox-6.patch} (70%) rename target/linux/bcm63xx/patches-5.4/{535-board_fast2504n.patch => 632-board_bcm6362-sagem-fast-2504n.patch} (80%) rename target/linux/bcm63xx/patches-5.4/{564-board-DGND3700v2.patch => 633-board-bcm6362-netgear-dgnd3700-v2.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{566-board-HG253s-v2.patch => 634-board-bcm6362-huawei-hg253s-v2.patch} (83%) rename target/linux/bcm63xx/patches-5.4/{518-bcm63xx-add-support-for-96368MVWG-board.patch => 651-bcm63xx-add-support-for-96368MVWG-board.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{519-bcm63xx-add-support-for-96368MVNgr-board.patch => 652-bcm63xx-add-support-for-96368MVNgr-board.patch} (82%) rename target/linux/bcm63xx/patches-5.4/{542-board_WAP-5813n.patch => 653-board_bcm6369-comtrend-wap-5813n.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{543-board_VR-3025u.patch => 654-board_bcm6368-comtrend-vr-3025u.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{544-board_VR-3025un.patch => 655-board_bcm6368-comtrend-vr-3025un.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{545-board_P870HW-51a_v2.patch => 656-board_bcm6368-zyxel-p870hw-51a-v2.patch} (84%) rename target/linux/bcm63xx/patches-5.4/{549-board_DGND3700v1_3800B.patch => 657-board_bcm6368-netgear-dgnd3700-v1.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{551-board_HG655b.patch => 658-board_bcm6368-huawei-echolife-hg655b.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{553-board_VR-3026e.patch => 659-board_bcm6368-comtrend-vr-3026e.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{555-board_HG622.patch => 660-board_bcm6368-huawei-echolife-hg622.patch} (89%) rename target/linux/bcm63xx/patches-5.4/{556-board_EVG2000.patch => 661-board_bcm6369-netgear-evg2000.patch} (88%) rename target/linux/bcm63xx/patches-5.4/{557-board_AV4202N.patch => 662-board_bcm6368-adb-av4202n.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{558-board_VH4032N.patch => 663-board_bcm6368-observa-vh4032n.patch} (94%) rename target/linux/bcm63xx/patches-5.4/{559-board_R1000H.patch => 664-board_bcm6368-actiontec-r1000h.patch} (85%) rename target/linux/bcm63xx/patches-5.4/{538-board_bcm963269bhr.patch => 681-board_bcm63269-brcm-bcm963269bhr.patch} (80%) rename target/linux/bcm63xx/patches-5.4/{540-board_vw6339gu.patch => 682-board_bcm63268-inteno-vg50.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{541-board_963268gu_p300.patch => 683-board_bcm63268-brcm-bcm963268bu-p300.patch} (85%) rename target/linux/bcm63xx/patches-5.4/{562-board_sr102.patch => 684-board_bcm63168-sky-sr102.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{563-board-VR-3032u.patch => 685-board-bcm63168-comtrend-vr-3032u.patch} (87%) rename target/linux/bcm63xx/patches-5.4/{565-board-VG-8050.patch => 686-board-bcm63169-comtrend-vg-8050.patch} (86%) rename target/linux/bcm63xx/patches-5.4/{568-board-H500s.patch => 687-board-bcm63167-sercomm-h500-s.patch} (100%) 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/500-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch similarity index 97% rename from target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch rename to target/linux/bcm63xx/patches-5.4/500-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch index 0221e75bfc..62f872dd32 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/500-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 -@@ -693,6 +693,52 @@ static const struct board_info __initcon +@@ -439,6 +439,52 @@ static const struct board_info __initcon }; static struct of_device_id const bcm963xx_boards_dt[] = { diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/501-board_bcm6318-brcm-bcm96318ref.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch rename to target/linux/bcm63xx/patches-5.4/501-board_bcm6318-brcm-bcm96318ref.patch index dee7659d20..0313285eaa 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/501-board_bcm6318-brcm-bcm96318ref.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -50,6 +50,53 @@ static struct board_info __initdata boar +@@ -49,6 +49,53 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_3368 */ /* @@ -54,7 +54,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1409,6 +1456,9 @@ static const struct board_info __initcon +@@ -410,6 +457,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -63,12 +63,12 @@ +#endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, - &board_AR5381u, -@@ -1483,6 +1533,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6328 */ +@@ -444,6 +494,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 + { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, + { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/502-board_bcm6318-brcm-bcm96318ref-p300.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch rename to target/linux/bcm63xx/patches-5.4/502-board_bcm6318-brcm-bcm96318ref-p300.patch index 337d30114d..1796d066a5 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/502-board_bcm6318-brcm-bcm96318ref-p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -94,6 +94,48 @@ static struct board_info __initdata boar +@@ -93,6 +93,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1458,6 +1500,7 @@ static const struct board_info __initcon +@@ -459,6 +501,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -57,11 +57,11 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1534,6 +1577,7 @@ static struct of_device_id const bcm963x +@@ -495,6 +538,7 @@ static struct of_device_id const bcm963x #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, + { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/503-board_bcm6318-d-link-dsl-275xb-d.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch rename to target/linux/bcm63xx/patches-5.4/503-board_bcm6318-d-link-dsl-275xb-d.patch index a7beec0ac9..05022aa277 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/503-board_bcm6318-d-link-dsl-275xb-d.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -138,6 +138,72 @@ static struct board_info __initdata boar +@@ -135,6 +135,72 @@ static struct board_info __initdata boar }, }, }; @@ -73,7 +73,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1921,6 +1987,7 @@ static const struct board_info __initcon +@@ -502,6 +568,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -81,11 +81,11 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2010,6 +2077,7 @@ static struct of_device_id const bcm963x +@@ -539,6 +606,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, }, + { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "adb,a4001n", .data = &board_A4001N, }, + { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/504-board_bcm6318-sagem-fast-2704n.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch rename to target/linux/bcm63xx/patches-5.4/504-board_bcm6318-sagem-fast-2704n.patch index 5cf5cfafd2..2bb1f60241 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/504-board_bcm6318-sagem-fast-2704n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -204,6 +204,49 @@ static struct board_info __initdata boar +@@ -201,6 +201,49 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), }, }; @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2083,6 +2126,7 @@ static const struct board_info __initcon +@@ -569,6 +612,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -58,11 +58,11 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2176,6 +2220,7 @@ static struct of_device_id const bcm963x +@@ -607,6 +651,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, }, + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "adb,a4001n", .data = &board_A4001N, }, + { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/505-board_bcm6318-comtrend-ar-5315u.patch similarity index 91% rename from target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch rename to target/linux/bcm63xx/patches-5.4/505-board_bcm6318-comtrend-ar-5315u.patch index 38ef022e2a..dc480f239d 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/505-board_bcm6318-comtrend-ar-5315u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -139,6 +139,65 @@ static struct board_info __initdata boar +@@ -136,6 +136,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 }, -@@ -2471,6 +2530,7 @@ static const struct board_info __initcon +@@ -611,6 +670,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 */ -@@ -2572,6 +2632,7 @@ static struct of_device_id const bcm963x +@@ -650,6 +710,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/520-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-96328avng-reference-board.patch similarity index 93% rename from target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-96328avng-reference-board.patch index 6c2c5aa2c9..43ad569e1e 100644 --- a/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-96328avng-reference-board.patch @@ -9,7 +9,7 @@ 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,32 @@ static struct board_info __initdata boar +@@ -321,6 +321,32 @@ static struct board_info __initdata boar .use_fullspeed = 0, .port_no = 0, }, diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-963281TAN-reference-board.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-963281TAN-reference-board.patch index cdcc1c0aa7..a6f4a84336 100644 --- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -91,6 +91,39 @@ static struct board_info __initdata boar +@@ -348,6 +348,39 @@ static struct board_info __initdata boar }, }, }; @@ -49,16 +49,16 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -889,6 +922,7 @@ static const struct board_info __initcon - #endif /* CONFIG_BCM63XX_CPU_3368 */ +@@ -702,6 +735,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_963281TAN, #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x - #ifdef CONFIG_BCM63XX_CPU_6318 +@@ -741,6 +775,7 @@ static struct of_device_id const bcm963x + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/523-board_bcm6328-d-link-dsl-274xb-f.patch similarity index 90% rename from target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch rename to target/linux/bcm63xx/patches-5.4/523-board_bcm6328-d-link-dsl-274xb-f.patch index 25362e3123..97f71e115a 100644 --- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/523-board_bcm6328-d-link-dsl-274xb-f.patch @@ -10,7 +10,7 @@ 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 -@@ -124,6 +124,50 @@ static struct board_info __initdata boar +@@ -381,6 +381,50 @@ static struct board_info __initdata boar }, }, }; @@ -61,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -923,6 +967,7 @@ static const struct board_info __initcon +@@ -736,6 +780,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 +@@ -777,6 +822,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/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/524-board_bcm6328-adb-a4001n1.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch rename to target/linux/bcm63xx/patches-5.4/524-board_bcm6328-adb-a4001n1.patch index 209fbde002..065f2df164 100644 --- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_bcm6328-adb-a4001n1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -125,6 +125,49 @@ static struct board_info __initdata boar +@@ -382,6 +382,49 @@ static struct board_info __initdata boar }, }; @@ -50,7 +50,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1074,6 +1117,7 @@ static const struct board_info __initcon +@@ -780,6 +823,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -58,8 +58,8 @@ &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 - #ifdef CONFIG_BCM63XX_CPU_6318 +@@ -820,6 +864,7 @@ static struct of_device_id const bcm963x + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/525-board_bcm6328-comtrend-ar-5387un.patch similarity index 91% rename from target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch rename to target/linux/bcm63xx/patches-5.4/525-board_bcm6328-comtrend-ar-5387un.patch index d5d93eeb1f..99a026f9d5 100644 --- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_bcm6328-comtrend-ar-5387un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -92,6 +92,78 @@ static struct board_info __initdata boar +@@ -349,6 +349,78 @@ static struct board_info __initdata boar }, }; @@ -79,15 +79,15 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1116,6 +1188,7 @@ static const struct board_info __initcon - #endif /* CONFIG_BCM63XX_CPU_3368 */ +@@ -822,6 +894,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5387un, &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x +@@ -867,6 +940,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/526-board_bcm6328-comtrend-ar-5381u.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch rename to target/linux/bcm63xx/patches-5.4/526-board_bcm6328-comtrend-ar-5381u.patch index 9f4facadbc..8ed555490b 100644 --- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_bcm6328-comtrend-ar-5381u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -92,6 +92,60 @@ static struct board_info __initdata boar +@@ -349,6 +349,60 @@ static struct board_info __initdata boar }, }; @@ -61,15 +61,15 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1188,6 +1242,7 @@ static const struct board_info __initcon - #endif /* CONFIG_BCM63XX_CPU_3368 */ +@@ -894,6 +948,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5381u, &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x +@@ -940,6 +995,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/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/527-board_bcm6328-sagem-fast-2704-v2.patch similarity index 90% rename from target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch rename to target/linux/bcm63xx/patches-5.4/527-board_bcm6328-sagem-fast-2704-v2.patch index 8edbc57101..4828c8e50c 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_bcm6328-sagem-fast-2704-v2.patch @@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -338,6 +338,42 @@ static struct board_info __initdata boar +@@ -594,6 +594,42 @@ static struct board_info __initdata boar }, }, }; @@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1349,6 +1385,7 @@ static const struct board_info __initcon +@@ -953,6 +989,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, -@@ -1422,6 +1459,7 @@ static struct of_device_id const bcm963x +@@ -998,6 +1035,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/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/528-board_bcm6328-adb-a4001n.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch rename to target/linux/bcm63xx/patches-5.4/528-board_bcm6328-adb-a4001n.patch index ec5313bb01..da2200652e 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_bcm6328-adb-a4001n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -343,6 +343,49 @@ static struct board_info __initdata boar +@@ -508,6 +508,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, -@@ -1884,6 +1927,7 @@ static const struct board_info __initcon +@@ -987,6 +1030,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,8 +58,8 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -1968,6 +2012,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, +@@ -1029,6 +1073,7 @@ static struct of_device_id const bcm963x + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/529-board_bcm6328-nucom-r5010un-v2.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch rename to target/linux/bcm63xx/patches-5.4/529-board_bcm6328-nucom-r5010un-v2.patch index fb99620823..4f63f23cda 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_bcm6328-nucom-r5010un-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -617,6 +617,50 @@ static struct board_info __initdata boar +@@ -673,6 +673,50 @@ static struct board_info __initdata boar }, }, }; @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2190,6 +2234,7 @@ static const struct board_info __initcon +@@ -1034,6 +1078,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, -@@ -2284,6 +2329,7 @@ static struct of_device_id const bcm963x +@@ -1080,6 +1125,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/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/530-board_bcm6328-sercomm-ad1018.patch similarity index 92% rename from target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch rename to target/linux/bcm63xx/patches-5.4/530-board_bcm6328-sercomm-ad1018.patch index ea972ff451..409f3d8e26 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_bcm6328-sercomm-ad1018.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -352,6 +352,71 @@ static struct board_info __initdata boar +@@ -349,6 +349,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 }, -@@ -2536,6 +2601,7 @@ static const struct board_info __initcon +@@ -1071,6 +1136,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, -@@ -2646,6 +2712,8 @@ static struct of_device_id const bcm963x +@@ -1127,6 +1193,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/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/531-board-bcm6328-adb-pdg-a4001n-a-000-1a1-ax.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch rename to target/linux/bcm63xx/patches-5.4/531-board-bcm6328-adb-pdg-a4001n-a-000-1a1-ax.patch index dec14545fe..3b08649bbc 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/531-board-bcm6328-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 -@@ -619,6 +619,49 @@ static struct board_info __initdata boar +@@ -616,6 +616,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, -@@ -2757,6 +2800,7 @@ static const struct board_info __initcon +@@ -1141,6 +1184,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, -@@ -2861,6 +2905,7 @@ static struct of_device_id const bcm963x +@@ -1186,6 +1230,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/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/541-board-bcm6338-d-link-dsl-2640u.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch rename to target/linux/bcm63xx/patches-5.4/541-board-bcm6338-d-link-dsl-2640u.patch index ccf9fa5ce4..2c6a4950bb 100644 --- a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board-bcm6338-d-link-dsl-2640u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -98,6 +98,19 @@ static struct board_info __initdata boar +@@ -858,6 +858,19 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -481,6 +494,7 @@ static const struct board_info __initcon +@@ -1193,6 +1206,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -519,6 +533,7 @@ static struct of_device_id const bcm963x +@@ -1244,6 +1258,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/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/542-board_bcm6338-dynalink-rta1320.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch rename to target/linux/bcm63xx/patches-5.4/542-board_bcm6338-dynalink-rta1320.patch index 1cc900baf9..d3b048a6ac 100644 --- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_bcm6338-dynalink-rta1320.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -111,6 +111,19 @@ static struct board_info __initdata boar +@@ -871,6 +871,19 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -647,6 +660,7 @@ static const struct board_info __initcon +@@ -1207,6 +1220,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, -@@ -692,6 +706,7 @@ static struct of_device_id const bcm963x +@@ -1258,6 +1272,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/531-board_rta770bw_rta770w.patch b/target/linux/bcm63xx/patches-5.4/551-board_bcm6345-dynalink-rta770bw-rta770w.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch rename to target/linux/bcm63xx/patches-5.4/551-board_bcm6345-dynalink-rta770bw-rta770w.patch index aa01f153db..225c754924 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_bcm6345-dynalink-rta770bw-rta770w.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -406,6 +406,19 @@ static struct board_info __initdata boar +@@ -894,6 +894,19 @@ static struct board_info __initdata boar .name = "96345GW2", .expected_cpu_id = 0x6345, }; @@ -20,7 +20,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1256,6 +1269,7 @@ static const struct board_info __initcon +@@ -1224,6 +1237,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,8 @@ static struct of_device_id const bcm963x +@@ -1277,6 +1291,8 @@ static struct of_device_id const bcm963x #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/561-board-bcm6348-D4PW.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch rename to target/linux/bcm63xx/patches-5.4/561-board-bcm6348-D4PW.patch index 399fda760d..62e8f381c1 100644 --- a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board-bcm6348-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -294,6 +294,21 @@ static struct board_info __initdata boar +@@ -1093,6 +1093,21 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -22,7 +22,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -429,6 +444,7 @@ static const struct board_info __initcon +@@ -1248,6 +1263,7 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, @@ -30,7 +30,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -461,6 +477,7 @@ static struct of_device_id const bcm963x +@@ -1300,6 +1316,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/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/562-board_bcm6348-t-com-speedport-w-500v.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch rename to target/linux/bcm63xx/patches-5.4/562-board_bcm6348-t-com-speedport-w-500v.patch index 4f57d441bc..a20047d3d3 100644 --- a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_bcm6348-t-com-speedport-w-500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -322,6 +322,36 @@ static struct board_info __initdata boar +@@ -1108,6 +1108,36 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -542,6 +572,7 @@ static const struct board_info __initcon +@@ -1264,6 +1294,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, -@@ -584,6 +615,7 @@ static struct of_device_id const bcm963x +@@ -1321,6 +1352,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/563-board_bcm6348-tecom-gw6000-gw6200.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch rename to target/linux/bcm63xx/patches-5.4/563-board_bcm6348-tecom-gw6000-gw6200.patch index 1384ac6b07..3d9c000803 100644 --- a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board_bcm6348-tecom-gw6000-gw6200.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -216,6 +216,46 @@ static struct board_info __initdata boar +@@ -1002,6 +1002,46 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -47,7 +47,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -565,6 +605,8 @@ static const struct board_info __initcon +@@ -1287,6 +1327,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -56,7 +56,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -616,6 +658,8 @@ static struct of_device_id const bcm963x +@@ -1353,6 +1395,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/564-board-bcm6348-telsey-magic.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch rename to target/linux/bcm63xx/patches-5.4/564-board-bcm6348-telsey-magic.patch index 58bd2f3983..ba9ee0b4d4 100644 --- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-bcm6348-telsey-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,30 @@ static struct board_info __initdata boar +@@ -1178,6 +1178,30 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -31,7 +31,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -615,6 +639,7 @@ static const struct board_info __initcon +@@ -1337,6 +1361,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, @@ -39,7 +39,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -660,6 +685,7 @@ static struct of_device_id const bcm963x +@@ -1397,6 +1422,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/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/565-board_bcm6348-bt-voyager-2500v-bb.patch similarity index 91% rename from target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch rename to target/linux/bcm63xx/patches-5.4/565-board_bcm6348-bt-voyager-2500v-bb.patch index e72c208cb3..6536e17798 100644 --- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board_bcm6348-bt-voyager-2500v-bb.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -429,6 +429,27 @@ static struct board_info __initdata boar +@@ -1202,6 +1202,27 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -693,6 +714,7 @@ static const struct board_info __initcon +@@ -1362,6 +1383,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, -@@ -733,6 +755,7 @@ static struct of_device_id const bcm963x +@@ -1414,6 +1436,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, }, -@@ -794,6 +817,22 @@ void __init board_bcm963xx_init(void) +@@ -1469,6 +1492,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/566-board_bcm6348-bt-voyager-2110.patch similarity index 85% rename from target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch rename to target/linux/bcm63xx/patches-5.4/566-board_bcm6348-bt-voyager-2110.patch index 03246b6378..c51b28854b 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board_bcm6348-bt-voyager-2110.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -206,6 +206,22 @@ static struct board_info __initdata boar +@@ -979,6 +979,22 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -23,7 +23,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -715,6 +731,7 @@ static const struct board_info __initcon +@@ -1384,6 +1400,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, -@@ -755,6 +772,7 @@ static struct of_device_id const bcm963x +@@ -1436,6 +1453,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/567-MIPS-BCM63XX-add-inventel-Livebox-support.patch similarity index 100% rename from target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch rename to target/linux/bcm63xx/patches-5.4/567-MIPS-BCM63XX-add-inventel-Livebox-support.patch diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/568-board_bcm6348-comtrend-ct-536plus-ct-5621.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch rename to target/linux/bcm63xx/patches-5.4/568-board_bcm6348-comtrend-ct-536plus-ct-5621.patch index b653702b49..c815e66f1d 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board_bcm6348-comtrend-ct-536plus-ct-5621.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -222,6 +222,30 @@ static struct board_info __initdata boar +@@ -995,6 +995,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -732,6 +756,7 @@ static const struct board_info __initcon +@@ -1401,6 +1425,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, @@ -39,7 +39,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -774,6 +799,8 @@ static struct of_device_id const bcm963x +@@ -1455,6 +1480,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/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/569-board_bcm6348-comtrend-ct-5365.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch rename to target/linux/bcm63xx/patches-5.4/569-board_bcm6348-comtrend-ct-5365.patch index fe1a7e2e0c..7dbfb825fa 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/569-board_bcm6348-comtrend-ct-5365.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -246,6 +246,29 @@ static struct board_info __initdata boar +@@ -1019,6 +1019,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -758,6 +781,7 @@ static const struct board_info __initcon +@@ -1426,6 +1449,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 +@@ -1481,6 +1505,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/570-board_bcm6348-telsey-cpva502plus.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch rename to target/linux/bcm63xx/patches-5.4/570-board_bcm6348-telsey-cpva502plus.patch index 980be2952c..dc028609be 100644 --- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/570-board_bcm6348-telsey-cpva502plus.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -222,6 +222,34 @@ static struct board_info __initdata boar +@@ -995,6 +995,34 @@ static struct board_info __initdata boar }, }; @@ -35,7 +35,7 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", .expected_cpu_id = 0x6348, -@@ -782,6 +810,7 @@ static const struct board_info __initcon +@@ -1450,6 +1478,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 +@@ -1515,6 +1544,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/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/571-board_bcm6348-netgear-dg834g-v4.patch similarity index 85% rename from target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch rename to target/linux/bcm63xx/patches-5.4/571-board_bcm6348-netgear-dg834g-v4.patch index 6e61744189..d68f690578 100644 --- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/571-board_bcm6348-netgear-dg834g-v4.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -555,6 +555,23 @@ static struct board_info __initdata boar +@@ -1225,6 +1225,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, -@@ -997,6 +1014,7 @@ static const struct board_info __initcon +@@ -1479,6 +1496,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 +@@ -1540,6 +1558,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/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/572-board_bcm6348-sagem-fast-2604.patch similarity index 85% rename from target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch rename to target/linux/bcm63xx/patches-5.4/572-board_bcm6348-sagem-fast-2604.patch index 733d745def..21b10da89f 100644 --- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/572-board_bcm6348-sagem-fast-2604.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -489,6 +489,22 @@ static struct board_info __initdata boar +@@ -1159,6 +1159,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, -@@ -1077,6 +1093,7 @@ static const struct board_info __initcon +@@ -1485,6 +1501,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 +@@ -1560,6 +1577,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/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/573-board_bcm6348-asmax-ar-1004g.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch rename to target/linux/bcm63xx/patches-5.4/573-board_bcm6348-asmax-ar-1004g.patch index cc16adf402..a1eeee3b22 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/573-board_bcm6348-asmax-ar-1004g.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 -@@ -617,6 +617,21 @@ static struct board_info __initdata boar +@@ -979,6 +979,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", -@@ -1582,6 +1597,7 @@ static const struct board_info __initcon +@@ -1514,6 +1529,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, -@@ -1643,6 +1659,7 @@ static struct of_device_id const bcm963x +@@ -1561,6 +1577,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/601-board-bcm6358-DWV-S0_fixes.patch similarity index 59% rename from target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch rename to target/linux/bcm63xx/patches-5.4/601-board-bcm6358-DWV-S0_fixes.patch index 1460256e8c..fa35102aa0 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch +++ b/target/linux/bcm63xx/patches-5.4/601-board-bcm6358-DWV-S0_fixes.patch @@ -1,10 +1,10 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -613,6 +613,7 @@ static struct board_info __initdata boar +@@ -1468,6 +1468,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, + .has_ehci0 = 1, }; + #endif /* CONFIG_BCM63XX_CPU_6358 */ - /* D-Link DSL-274xB revison C2/C3 */ diff --git a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/602-board-bcm6358-sfr-neufbox-4.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/501-board-NB4.patch rename to target/linux/bcm63xx/patches-5.4/602-board-bcm6358-sfr-neufbox-4.patch index 9eb7655d33..bb5ce6f840 100644 --- a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-5.4/602-board-bcm6358-sfr-neufbox-4.patch @@ -1,8 +1,8 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -416,6 +416,56 @@ static struct board_info __initdata boar - +@@ -1470,6 +1470,56 @@ static struct board_info __initdata boar .has_ohci0 = 1, + .has_ehci0 = 1, }; + +static struct board_info __initdata board_nb4_ser_r0 = { @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -451,6 +501,8 @@ static const struct board_info __initcon +@@ -1537,6 +1587,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -66,7 +66,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -494,6 +546,8 @@ static struct of_device_id const bcm963x +@@ -1613,6 +1665,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/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/603-board-bcm6358-telsey-cpva642.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch rename to target/linux/bcm63xx/patches-5.4/603-board-bcm6358-telsey-cpva642.patch index 26a107c6b5..be860fa722 100644 --- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-5.4/603-board-bcm6358-telsey-cpva642.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -382,6 +382,23 @@ static struct board_info __initdata boar +@@ -1422,6 +1422,23 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -514,6 +531,7 @@ static const struct board_info __initcon +@@ -1586,6 +1603,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -32,7 +32,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -563,6 +581,7 @@ static struct of_device_id const bcm963x +@@ -1667,6 +1685,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/604-board_bcm6358-d-link-dsl-274xb-c.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch rename to target/linux/bcm63xx/patches-5.4/604-board_bcm6358-d-link-dsl-274xb-c.patch index 90ece67f71..3fb9940e78 100644 --- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/bcm63xx/patches-5.4/604-board_bcm6358-d-link-dsl-274xb-c.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -447,6 +447,22 @@ static struct board_info __initdata boar - .has_ohci0 = 1, +@@ -1488,6 +1488,22 @@ static struct board_info __initdata boar + .has_ehci0 = 1, }; +/* D-Link DSL-274xB revison C2/C3 */ @@ -23,7 +23,7 @@ static struct board_info __initdata board_nb4_ser_r0 = { .name = "NB4-SER-r0", .expected_cpu_id = 0x6358, -@@ -533,6 +549,7 @@ static const struct board_info __initcon +@@ -1605,6 +1621,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 */ -@@ -574,6 +591,7 @@ static struct of_device_id const bcm963x +@@ -1678,6 +1695,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/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/605-board_bcm6358-huawei-echolife-hg553.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/508-board_hw553.patch rename to target/linux/bcm63xx/patches-5.4/605-board_bcm6358-huawei-echolife-hg553.patch index b03b14f96e..e5eb2ff8e2 100644 --- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/605-board_bcm6358-huawei-echolife-hg553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -606,6 +606,31 @@ static struct board_info __initdata boar +@@ -1553,6 +1553,31 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -32,7 +32,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -650,6 +675,7 @@ static const struct board_info __initcon +@@ -1624,6 +1649,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 */ }; -@@ -695,6 +721,7 @@ static struct of_device_id const bcm963x +@@ -1697,6 +1723,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/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/606-board_bcm6358-t-com-speedport-w-303v.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch rename to target/linux/bcm63xx/patches-5.4/606-board_bcm6358-t-com-speedport-w-303v.patch index 26e99196fd..114e55a14d 100644 --- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/606-board_bcm6358-t-com-speedport-w-303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -644,6 +644,20 @@ static struct board_info __initdata boar +@@ -1578,6 +1578,20 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -690,6 +704,7 @@ static const struct board_info __initcon +@@ -1650,6 +1664,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 */ }; -@@ -743,6 +758,7 @@ static struct of_device_id const bcm963x +@@ -1730,6 +1745,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/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/607-board_bcm6358-comtrend-ct-6373.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch rename to target/linux/bcm63xx/patches-5.4/607-board_bcm6358-comtrend-ct-6373.patch index 4a6280dcab..4c0ff79067 100644 --- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/607-board_bcm6358-comtrend-ct-6373.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -853,6 +853,30 @@ static struct board_info __initdata boar +@@ -1554,6 +1554,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1025,6 +1049,7 @@ static const struct board_info __initcon +@@ -1663,6 +1687,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 +@@ -1736,6 +1761,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/608-board_bcm6358-d-link-dva-g3810bn-tl.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch rename to target/linux/bcm63xx/patches-5.4/608-board_bcm6358-d-link-dva-g3810bn-tl.patch index afa9cf2002..a106ab8447 100644 --- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/608-board_bcm6358-d-link-dva-g3810bn-tl.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -915,6 +915,31 @@ static struct board_info __initdata boar +@@ -1616,6 +1616,31 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -32,15 +32,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1052,6 +1077,7 @@ static const struct board_info __initcon +@@ -1690,6 +1715,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, + &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ - #ifdef CONFIG_BCM63XX_CPU_6368 - &board_96368mvwg, -@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x + }; + +@@ -1764,6 +1790,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/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/609-board_bcm6358-huawei-echolife-hg556.patch similarity index 93% rename from target/linux/bcm63xx/patches-5.4/532-board_hw556.patch rename to target/linux/bcm63xx/patches-5.4/609-board_bcm6358-huawei-echolife-hg556.patch index 890e2e01d5..d05e6ca985 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/609-board_bcm6358-huawei-echolife-hg556.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -1100,6 +1101,94 @@ static struct board_info __initdata boar +@@ -1603,6 +1604,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", -@@ -1304,6 +1393,9 @@ static const struct board_info __initcon +@@ -1714,6 +1803,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 */ -@@ -1377,6 +1469,9 @@ static struct of_device_id const bcm963x +@@ -1792,6 +1884,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/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/610-board_bcm6359-huawei-echolife-hg520v.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/546-board_hw520.patch rename to target/linux/bcm63xx/patches-5.4/610-board_bcm6359-huawei-echolife-hg520v.patch index a29f9bd573..ff31e2973a 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/610-board_bcm6359-huawei-echolife-hg520v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1218,6 +1218,36 @@ static struct board_info __initdata boar +@@ -1579,6 +1579,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1901,6 +1931,7 @@ static const struct board_info __initcon +@@ -1802,6 +1832,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, -@@ -1991,6 +2022,7 @@ static struct of_device_id const bcm963x +@@ -1883,6 +1914,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/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/611-board_bcm6358-bt-home-hub-2-a.patch similarity index 81% rename from target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch rename to target/linux/bcm63xx/patches-5.4/611-board_bcm6358-bt-home-hub-2-a.patch index dc81ea6b73..b7caeb417b 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/611-board_bcm6358-bt-home-hub-2-a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1327,6 +1327,31 @@ static struct board_info __initdata boar +@@ -1579,6 +1579,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, -@@ -2066,6 +2091,7 @@ static const struct board_info __initcon +@@ -1832,6 +1857,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,11 +40,11 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2173,6 +2199,7 @@ static struct of_device_id const bcm963x +@@ -1927,6 +1953,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, }, + { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 - { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, + #endif /* CONFIG_BCM63XX_CPU_6362 */ diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/631-board_bcm6361-sfr-neufbox-6.patch similarity index 70% rename from target/linux/bcm63xx/patches-5.4/526-board_nb6.patch rename to target/linux/bcm63xx/patches-5.4/631-board_bcm6361-sfr-neufbox-6.patch index ed0115470a..79e9efb2b4 100644 --- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/631-board_bcm6361-sfr-neufbox-6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -942,6 +942,31 @@ static struct board_info __initdata boar +@@ -1787,6 +1787,31 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -30,23 +30,23 @@ +#endif /* CONFIG_BCM63XX_CPU_6362 */ + /* - * known 6368 boards + * all boards */ -@@ -1079,6 +1104,9 @@ static const struct board_info __initcon +@@ -1866,6 +1891,9 @@ static const struct board_info __initcon &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6362 + &board_nb6, +#endif /* CONFIG_BCM63XX_CPU_6362 */ - #ifdef CONFIG_BCM63XX_CPU_6368 - &board_96368mvwg, - &board_96368mvngr, -@@ -1150,6 +1178,7 @@ static struct of_device_id const bcm963x - { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, + }; + + static struct of_device_id const bcm963xx_boards_dt[] = { +@@ -1956,6 +1984,7 @@ static struct of_device_id const bcm963x + { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 - { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, + #endif /* CONFIG_BCM63XX_CPU_6368 */ diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/632-board_bcm6362-sagem-fast-2504n.patch similarity index 80% rename from target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch rename to target/linux/bcm63xx/patches-5.4/632-board_bcm6362-sagem-fast-2504n.patch index ab5b61880f..3bb3ad4238 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/632-board_bcm6362-sagem-fast-2504n.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 -@@ -1288,6 +1288,37 @@ static struct board_info __initdata boar +@@ -1810,6 +1810,37 @@ static struct board_info __initdata boar }, }, }; @@ -44,16 +44,16 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1438,6 +1469,7 @@ static const struct board_info __initcon +@@ -1893,6 +1924,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ - #ifdef CONFIG_BCM63XX_CPU_6368 - &board_96368mvwg, -@@ -1520,6 +1552,7 @@ static struct of_device_id const bcm963x - { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, + }; + +@@ -1984,6 +2016,7 @@ static struct of_device_id const bcm963x + { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 + { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/633-board-bcm6362-netgear-dgnd3700-v2.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch rename to target/linux/bcm63xx/patches-5.4/633-board-bcm6362-netgear-dgnd3700-v2.patch index 559f00c87a..17beb14154 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/633-board-bcm6362-netgear-dgnd3700-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1770,6 +1770,30 @@ static struct board_info __initdata boar +@@ -1811,6 +1811,30 @@ static struct board_info __initdata boar }, }; @@ -31,15 +31,15 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2736,6 +2760,7 @@ static const struct board_info __initcon +@@ -1924,6 +1948,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_dgnd3700v2, &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ - #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2850,6 +2875,7 @@ static struct of_device_id const bcm963x + }; +@@ -2016,6 +2041,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/634-board-bcm6362-huawei-hg253s-v2.patch similarity index 83% rename from target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch rename to target/linux/bcm63xx/patches-5.4/634-board-bcm6362-huawei-hg253s-v2.patch index 10414fe41c..db36cf2ff4 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/634-board-bcm6362-huawei-hg253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1824,6 +1824,37 @@ static struct board_info __initdata boar +@@ -1865,6 +1865,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,15 +38,15 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2787,6 +2818,7 @@ static const struct board_info __initcon +@@ -1950,6 +1981,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, + &board_hg253s_v2, #endif /* CONFIG_BCM63XX_CPU_6362 */ - #ifdef CONFIG_BCM63XX_CPU_6368 - &board_AV4202N, -@@ -2901,6 +2933,7 @@ static struct of_device_id const bcm963x + }; + +@@ -2041,6 +2073,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/651-bcm63xx-add-support-for-96368MVWG-board.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch rename to target/linux/bcm63xx/patches-5.4/651-bcm63xx-add-support-for-96368MVWG-board.patch index 7aac2a5d71..948d473f53 100644 --- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/bcm63xx/patches-5.4/651-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,8 +10,8 @@ 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 -@@ -774,6 +774,52 @@ static struct board_info __initdata boar - #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1899,6 +1899,52 @@ static struct board_info __initdata boar + #endif /* CONFIG_BCM63XX_CPU_6362 */ /* + * known 6368 boards @@ -63,18 +63,18 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -824,6 +870,9 @@ static const struct board_info __initcon - &board_HW553, - &board_spw303v, - #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1983,6 +2029,9 @@ static const struct board_info __initcon + &board_fast2504n, + &board_hg253s_v2, + #endif /* CONFIG_BCM63XX_CPU_6362 */ +#ifdef CONFIG_BCM63XX_CPU_6368 + &board_96368mvwg, +#endif /* CONFIG_BCM63XX_CPU_6368 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -888,6 +937,7 @@ static struct of_device_id const bcm963x - #ifdef CONFIG_BCM63XX_CPU_6362 +@@ -2079,6 +2128,7 @@ static struct of_device_id const bcm963x + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/652-bcm63xx-add-support-for-96368MVNgr-board.patch similarity index 82% rename from target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch rename to target/linux/bcm63xx/patches-5.4/652-bcm63xx-add-support-for-96368MVNgr-board.patch index f123fa663c..663304d08f 100644 --- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/bcm63xx/patches-5.4/652-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 -@@ -817,6 +817,41 @@ static struct board_info __initdata boar +@@ -1942,6 +1942,41 @@ static struct board_info __initdata boar }, }, }; @@ -51,16 +51,16 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -872,6 +907,7 @@ static const struct board_info __initcon - #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -2031,6 +2066,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, + &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ }; -@@ -937,6 +973,7 @@ static struct of_device_id const bcm963x - #ifdef CONFIG_BCM63XX_CPU_6362 +@@ -2128,6 +2164,7 @@ static struct of_device_id const bcm963x + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/653-board_bcm6369-comtrend-wap-5813n.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch rename to target/linux/bcm63xx/patches-5.4/653-board_bcm6369-comtrend-wap-5813n.patch index 168e0c6ef2..0386dc8308 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/653-board_bcm6369-comtrend-wap-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1504,6 +1506,47 @@ static struct board_info __initdata boar +@@ -1977,6 +1979,47 @@ static struct board_info __initdata boar }, }, }; @@ -57,19 +57,19 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1724,6 +1767,7 @@ static const struct board_info __initcon +@@ -2067,6 +2110,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ - #ifdef CONFIG_BCM63XX_CPU_63268 - &board_963268bu_p300, -@@ -1816,6 +1860,7 @@ static struct of_device_id const bcm963x + }; + +@@ -2166,6 +2210,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, }, + { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, + #endif /* CONFIG_BCM63XX_CPU_63268 */ diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/654-board_bcm6368-comtrend-vr-3025u.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch rename to target/linux/bcm63xx/patches-5.4/654-board_bcm6368-comtrend-vr-3025u.patch index 55e4ec02dd..7772594394 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/654-board_bcm6368-comtrend-vr-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1507,6 +1507,59 @@ static struct board_info __initdata boar +@@ -1980,6 +1980,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 }, -@@ -1767,6 +1820,7 @@ static const struct board_info __initcon +@@ -2110,6 +2163,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_VR3025u, &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ - #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1860,6 +1914,7 @@ static struct of_device_id const bcm963x + }; +@@ -2210,6 +2264,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/655-board_bcm6368-comtrend-vr-3025un.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch rename to target/linux/bcm63xx/patches-5.4/655-board_bcm6368-comtrend-vr-3025un.patch index 45293c8291..82c0887840 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/655-board_bcm6368-comtrend-vr-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1560,6 +1560,59 @@ static struct board_info __initdata boar +@@ -2033,6 +2033,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 }, -@@ -1821,6 +1874,7 @@ static const struct board_info __initcon +@@ -2164,6 +2217,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, + &board_VR3025un, &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ - #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1915,6 +1969,7 @@ static struct of_device_id const bcm963x + }; +@@ -2265,6 +2319,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/656-board_bcm6368-zyxel-p870hw-51a-v2.patch similarity index 84% rename from target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch rename to target/linux/bcm63xx/patches-5.4/656-board_bcm6368-zyxel-p870hw-51a-v2.patch index ce76703d88..0c2c2b9c8d 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/656-board_bcm6368-zyxel-p870hw-51a-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1516,6 +1516,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1989,6 +1989,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, -@@ -1873,6 +1915,7 @@ static const struct board_info __initcon +@@ -2216,6 +2258,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,11 +57,11 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -1971,6 +2014,7 @@ static struct of_device_id const bcm963x +@@ -2321,6 +2364,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, }, + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, + #endif /* CONFIG_BCM63XX_CPU_63268 */ diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/657-board_bcm6368-netgear-dgnd3700-v1.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch rename to target/linux/bcm63xx/patches-5.4/657-board_bcm6368-netgear-dgnd3700-v1.patch index a09cac1d53..47a19afbfa 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/657-board_bcm6368-netgear-dgnd3700-v1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1646,6 +1646,30 @@ static struct board_info __initdata boar +@@ -1980,6 +1980,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 }, -@@ -2057,6 +2081,7 @@ static const struct board_info __initcon +@@ -2258,6 +2282,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, -@@ -2159,6 +2184,7 @@ static struct of_device_id const bcm963x +@@ -2364,6 +2389,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/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/658-board_bcm6368-huawei-echolife-hg655b.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch rename to target/linux/bcm63xx/patches-5.4/658-board_bcm6368-huawei-echolife-hg655b.patch index 24a7e08f83..c1ad040cba 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/658-board_bcm6368-huawei-echolife-hg655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1695,6 +1695,52 @@ static struct board_info __initdata boar +@@ -2004,6 +2004,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 }, -@@ -2108,6 +2154,7 @@ static const struct board_info __initcon +@@ -2283,6 +2329,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, -@@ -2211,6 +2258,7 @@ static struct of_device_id const bcm963x +@@ -2389,6 +2436,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/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/659-board_bcm6368-comtrend-vr-3026e.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch rename to target/linux/bcm63xx/patches-5.4/659-board_bcm6368-comtrend-vr-3026e.patch index 5b9973932b..4be53d10ab 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/659-board_bcm6368-comtrend-vr-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1932,6 +1932,59 @@ static struct board_info __initdata boar +@@ -2198,6 +2198,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 }, -@@ -2202,6 +2255,7 @@ static const struct board_info __initcon +@@ -2333,6 +2386,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, + &board_VR3026e, &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ - #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2302,6 +2356,7 @@ static struct of_device_id const bcm963x + }; +@@ -2435,6 +2489,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/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/660-board_bcm6368-huawei-echolife-hg622.patch similarity index 89% rename from target/linux/bcm63xx/patches-5.4/555-board_HG622.patch rename to target/linux/bcm63xx/patches-5.4/660-board_bcm6368-huawei-echolife-hg622.patch index 13b26fc35e..c025a45eeb 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/660-board_bcm6368-huawei-echolife-hg622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1828,6 +1828,52 @@ static struct board_info __initdata boar +@@ -2050,6 +2050,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 }, -@@ -2296,6 +2342,7 @@ static const struct board_info __initcon +@@ -2382,6 +2428,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, -@@ -2404,6 +2451,7 @@ static struct of_device_id const bcm963x +@@ -2491,6 +2538,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/661-board_bcm6369-netgear-evg2000.patch similarity index 88% rename from target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch rename to target/linux/bcm63xx/patches-5.4/661-board_bcm6369-netgear-evg2000.patch index c42cc61936..b33cb3a1ce 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/661-board_bcm6369-netgear-evg2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1782,6 +1782,43 @@ static struct board_info __initdata boar +@@ -2004,6 +2004,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2342,6 +2379,7 @@ static const struct board_info __initcon +@@ -2428,6 +2465,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, -@@ -2454,6 +2492,7 @@ static struct of_device_id const bcm963x +@@ -2541,6 +2579,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/662-board_bcm6368-adb-av4202n.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch rename to target/linux/bcm63xx/patches-5.4/662-board_bcm6368-adb-av4202n.patch index 10db0ab410..5f224e5bd4 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/662-board_bcm6368-adb-av4202n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1682,6 +1682,49 @@ static struct board_info __initdata boar +@@ -1904,6 +1904,49 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -50,15 +50,15 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2376,6 +2419,7 @@ static const struct board_info __initcon - &board_fast2504n, +@@ -2462,6 +2505,7 @@ static const struct board_info __initcon + &board_hg253s_v2, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 + &board_AV4202N, &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2483,6 +2527,7 @@ static struct of_device_id const bcm963x +@@ -2570,6 +2614,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #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/663-board_bcm6368-observa-vh4032n.patch similarity index 94% rename from target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch rename to target/linux/bcm63xx/patches-5.4/663-board_bcm6368-observa-vh4032n.patch index d5be26bc18..d2b0a44c29 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/663-board_bcm6368-observa-vh4032n.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2155,6 +2155,106 @@ static struct board_info __initdata boar +@@ -2377,6 +2377,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 }, -@@ -2427,6 +2527,7 @@ static const struct board_info __initcon +@@ -2513,6 +2613,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2538,6 +2639,7 @@ static struct of_device_id const bcm963x +@@ -2625,6 +2726,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/664-board_bcm6368-actiontec-r1000h.patch similarity index 85% rename from target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch rename to target/linux/bcm63xx/patches-5.4/664-board_bcm6368-actiontec-r1000h.patch index 2de40e7cb7..716a6e030f 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/664-board_bcm6368-actiontec-r1000h.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar +@@ -2227,6 +2227,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, -@@ -2527,6 +2550,7 @@ static const struct board_info __initcon +@@ -2613,6 +2636,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x +@@ -2715,6 +2739,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/681-board_bcm63269-brcm-bcm963269bhr.patch similarity index 80% rename from target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch rename to target/linux/bcm63xx/patches-5.4/681-board_bcm63269-brcm-bcm963269bhr.patch index c1125f00ed..a064234114 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/681-board_bcm63269-brcm-bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1492,6 +1492,46 @@ static struct board_info __initdata boar +@@ -2543,6 +2543,46 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -47,9 +47,9 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1568,6 +1608,9 @@ static const struct board_info __initcon - &board_96368mvwg, - &board_96368mvngr, +@@ -2643,6 +2683,9 @@ static const struct board_info __initcon + &board_VR3026e, + &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ +#ifdef CONFIG_BCM63XX_CPU_63268 + &board_963269bhr, @@ -57,8 +57,8 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1655,6 +1698,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, +@@ -2755,6 +2798,7 @@ static struct of_device_id const bcm963x + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 + { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/682-board_bcm63268-inteno-vg50.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch rename to target/linux/bcm63xx/patches-5.4/682-board_bcm63268-inteno-vg50.patch index f582780ed4..1275af5c22 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/682-board_bcm63268-inteno-vg50.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1544,6 +1544,48 @@ static struct board_info __initdata boar +@@ -2580,6 +2580,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1626,6 +1668,7 @@ static const struct board_info __initcon +@@ -2685,6 +2727,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 */ }; -@@ -1716,6 +1759,7 @@ static struct of_device_id const bcm963x +@@ -2799,6 +2842,7 @@ static struct of_device_id const bcm963x #endif /* CONFIG_BCM63XX_CPU_6368 */ #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/683-board_bcm63268-brcm-bcm963268bu-p300.patch similarity index 85% rename from target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch rename to target/linux/bcm63xx/patches-5.4/683-board_bcm63268-brcm-bcm963268bu-p300.patch index 00c69a907b..c75d7a477e 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/683-board_bcm63268-brcm-bcm963268bu-p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1510,6 +1510,65 @@ static struct board_info __initdata boar +@@ -2546,6 +2546,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -66,16 +66,16 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1667,6 +1726,7 @@ static const struct board_info __initcon - &board_96368mvngr, +@@ -2726,6 +2785,7 @@ static const struct board_info __initcon + &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 + &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1758,6 +1818,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, +@@ -2841,6 +2901,7 @@ static struct of_device_id const bcm963x + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/684-board_bcm63168-sky-sr102.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/562-board_sr102.patch rename to target/linux/bcm63xx/patches-5.4/684-board_bcm63168-sky-sr102.patch index 0912c41dd2..7f1fb58a32 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/684-board_bcm63168-sky-sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2583,6 +2583,42 @@ static struct board_info __initdata boar +@@ -2681,6 +2681,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2687,6 +2723,7 @@ static const struct board_info __initcon +@@ -2788,6 +2824,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2800,6 +2837,7 @@ static struct of_device_id const bcm963x +@@ -2904,6 +2941,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/685-board-bcm63168-comtrend-vr-3032u.patch similarity index 87% rename from target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch rename to target/linux/bcm63xx/patches-5.4/685-board-bcm63168-comtrend-vr-3032u.patch index 8ac3f5051c..af4c5388cc 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/685-board-bcm63168-comtrend-vr-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2542,6 +2542,41 @@ static struct board_info __initdata boar +@@ -2640,6 +2640,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2722,6 +2757,7 @@ static const struct board_info __initcon +@@ -2823,6 +2858,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 */ -@@ -2836,6 +2872,7 @@ static struct of_device_id const bcm963x +@@ -2940,6 +2976,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/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/686-board-bcm63169-comtrend-vg-8050.patch similarity index 86% rename from target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch rename to target/linux/bcm63xx/patches-5.4/686-board-bcm63169-comtrend-vg-8050.patch index fa0cd6aef0..b55b4d3701 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/686-board-bcm63169-comtrend-vg-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2566,6 +2566,31 @@ static struct board_info __initdata boar +@@ -2640,6 +2640,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, -@@ -2782,6 +2807,7 @@ static const struct board_info __initcon +@@ -2858,6 +2883,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, -@@ -2898,6 +2924,7 @@ static struct of_device_id const bcm963x +@@ -2976,6 +3002,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/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/687-board-bcm63167-sercomm-h500-s.patch similarity index 100% rename from target/linux/bcm63xx/patches-5.4/568-board-H500s.patch rename to target/linux/bcm63xx/patches-5.4/687-board-bcm63167-sercomm-h500-s.patch From 591767fc0152ffd02954e359e33f575271b9089e Mon Sep 17 00:00:00 2001 From: Donald Hoskins Date: Sat, 15 Aug 2020 13:50:43 +0200 Subject: [PATCH 05/16] octeon: determine sysupgrade-* directory for upgrade automatically So far, the sysupgrade-* folder used during upgrade in octeon was hardcoded to contain the board name. Therefore, changing board name or BOARD_NAME variable in image/Makefile might have broken upgrade. Improve this by adding a step to determine the folder name via a wildcard, as it is done for generic nand_upgrade_tar() in lib/upgrade/nand.sh. While this still does not remove the problem for existing devices (which still have the old script), it will entirely remove the issue on newly added devices on this platform. Signed-off-by: Donald Hoskins [split into separate patch, add commit message, add return values] Signed-off-by: Adrian Schmutzler --- .../octeon/base-files/lib/upgrade/platform.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index 2de0f7a47e..c137609d7f 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -37,6 +37,10 @@ platform_do_flash() { local kernel=$3 local rootfs=$4 + local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + [ -n "$board_dir" ] || return 1 + mkdir -p /boot mount -t vfat /dev/$kernel /boot @@ -46,10 +50,10 @@ platform_do_flash() { } echo "flashing kernel to /dev/$kernel" - tar xf $tar_file sysupgrade-$board/kernel -O > /boot/vmlinux.64 + tar xf $tar_file $board_dir/kernel -O > /boot/vmlinux.64 md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5 echo "flashing rootfs to ${rootfs}" - tar xf $tar_file sysupgrade-$board/root -O | dd of="${rootfs}" bs=4096 + tar xf $tar_file $board_dir/root -O | dd of="${rootfs}" bs=4096 sync umount /boot } @@ -80,13 +84,17 @@ platform_do_upgrade() { platform_check_image() { local board=$(board_name) + local tar_file="$1" + + local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + [ -n "$board_dir" ] || return 1 case "$board" in er | \ erlite) - local tar_file="$1" - local kernel_length=$(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c 2> /dev/null) - local rootfs_length=$(tar xf $tar_file sysupgrade-$board/root -O | wc -c 2> /dev/null) + local kernel_length=$(tar xf $tar_file $board_dir/kernel -O | wc -c 2> /dev/null) + local rootfs_length=$(tar xf $tar_file $board_dir/root -O | wc -c 2> /dev/null) [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && { echo "The upgrade image is corrupt." return 1 From eadb1a943744997a8685c6de97a25d60d258af85 Mon Sep 17 00:00:00 2001 From: Donald Hoskins Date: Wed, 22 Jul 2020 05:26:33 -0400 Subject: [PATCH 06/16] octeon: add support for Itus Shield Router Itus Networks Shield - 1Ghz dual-core mips64 / Cavium Octeon 3 SoC, 1Gb RAM, 4Gb eMMC,3 GbE 10/100/1000 ports Information regarding device can be found: https://deviwiki.com/wiki/Itus_Networks_Shield_Pro Installing OpenWrt on Itus Networks Shield: 1) Boot Shield 2) On device: mount /dev/mmcblk1p1 /mnt 3) scp openwrt-octeon-itus,shield-router-initramfs-kernel.bin to /mnt/ItusrouterImage 3a) Optionally: scp openwrt-octeon-itus,shield-router-initramfs-kernel.bin to /mnt/ItusgatewayImage to allow you to have an emergency recovery boot in the GATEWAY slot - this slot will have no permament storage and is used for emergency recovery only when booted in the (G)ateway position 4) On device: umount /mnt 5) reboot Once booted, run the sysupgrade via cli or luCi on the openwrt-octeon-itus,shield-router-squashfs-sysupgrade.tar file the mode you are running. Once rebooted, the system installation is complete. Your storage partition for the mode is inialized and set. Signed-off-by: Donald Hoskins [cut out sysupgrade-* changes, move a few lines, drop case CVMX_BOARD_TYPE_ITUS_SHIELD] Signed-off-by: Adrian Schmutzler --- .../octeon/base-files/etc/board.d/01_network | 3 ++ .../octeon/base-files/lib/preinit/01_sysinfo | 4 ++ .../base-files/lib/preinit/79_move_config | 5 +++ .../octeon/base-files/lib/upgrade/platform.sh | 39 ++++++++++++----- target/linux/octeon/image/Makefile | 9 ++++ .../patches-5.4/130-itus_shield_support.patch | 42 +++++++++++++++++++ 6 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 target/linux/octeon/patches-5.4/130-itus_shield_support.patch diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network index f5c8175c54..c1b614f601 100755 --- a/target/linux/octeon/base-files/etc/board.d/01_network +++ b/target/linux/octeon/base-files/etc/board.d/01_network @@ -8,6 +8,9 @@ board_config_update case "$(board_name)" in +itus,shield-router) + ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0" + ;; *) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; diff --git a/target/linux/octeon/base-files/lib/preinit/01_sysinfo b/target/linux/octeon/base-files/lib/preinit/01_sysinfo index d8f467ed27..34fa7392d2 100644 --- a/target/linux/octeon/base-files/lib/preinit/01_sysinfo +++ b/target/linux/octeon/base-files/lib/preinit/01_sysinfo @@ -17,6 +17,10 @@ do_sysinfo_octeon() { name="erpro" ;; + "ITUS_SHIELD"*) + name="itus,shield-router" + ;; + *) name="generic" ;; diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config index 866bef495b..fd780a9461 100644 --- a/target/linux/octeon/base-files/lib/preinit/79_move_config +++ b/target/linux/octeon/base-files/lib/preinit/79_move_config @@ -10,6 +10,11 @@ move_config() { [ -f "/mnt/$BACKUP_FILE" ] && mv -f "/mnt/$BACKUP_FILE" / umount /mnt ;; + itus,shield-router) + mount -t vfat /dev/mmcblk1p1 /mnt + [ -f "/mnt/$BACKUP_FILE" ] && mv -f "/mnt/$BACKUP_FILE" / + umount /mnt + ;; esac } diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index c137609d7f..d938950906 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -28,6 +28,11 @@ platform_copy_config() { cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" umount /mnt ;; + itus,shield-router) + mount -t vfat /dev/mmcblk1p1 /mnt + cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" + umount /mnt + ;; esac } @@ -42,18 +47,29 @@ platform_do_flash() { [ -n "$board_dir" ] || return 1 mkdir -p /boot - mount -t vfat /dev/$kernel /boot - [ -f /boot/vmlinux.64 -a ! -L /boot/vmlinux.64 ] && { - mv /boot/vmlinux.64 /boot/vmlinux.64.previous - mv /boot/vmlinux.64.md5 /boot/vmlinux.64.md5.previous - } + if [ $board = "itus,shield-router" ]; then + # mmcblk1p1 (fat) contains all ELF-bin images for the Shield + mount /dev/mmcblk1p1 /boot + + echo "flashing Itus Kernel to /boot/$kernel (/dev/mmblk1p1)" + tar -Oxf $tar_file "$board_dir/kernel" > /boot/$kernel + else + mount -t vfat /dev/$kernel /boot + + [ -f /boot/vmlinux.64 -a ! -L /boot/vmlinux.64 ] && { + mv /boot/vmlinux.64 /boot/vmlinux.64.previous + mv /boot/vmlinux.64.md5 /boot/vmlinux.64.md5.previous + } + + echo "flashing kernel to /dev/$kernel" + tar xf $tar_file $board_dir/kernel -O > /boot/vmlinux.64 + md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5 + fi - echo "flashing kernel to /dev/$kernel" - tar xf $tar_file $board_dir/kernel -O > /boot/vmlinux.64 - md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5 echo "flashing rootfs to ${rootfs}" tar xf $tar_file $board_dir/root -O | dd of="${rootfs}" bs=4096 + sync umount /boot } @@ -72,6 +88,9 @@ platform_do_upgrade() { erlite) kernel=sda1 ;; + itus,shield-router) + kernel=ItusrouterImage + ;; *) return 1 esac @@ -79,7 +98,6 @@ platform_do_upgrade() { platform_do_flash $tar_file $board $kernel $rootfs return 0 - } platform_check_image() { @@ -92,7 +110,8 @@ platform_check_image() { case "$board" in er | \ - erlite) + erlite | \ + itus,shield-router) local kernel_length=$(tar xf $tar_file $board_dir/kernel -O | wc -c 2> /dev/null) local rootfs_length=$(tar xf $tar_file $board_dir/root -O | wc -c 2> /dev/null) [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && { diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile index e083e823c2..1dbb60edbc 100644 --- a/target/linux/octeon/image/Makefile +++ b/target/linux/octeon/image/Makefile @@ -29,6 +29,15 @@ define Device/generic endef TARGET_DEVICES += generic +ITUSROUTER_CMDLINE:=console=ttyS0,115200 root=/dev/mmcblk1p2 rootfstype=squashfs,ext4,f2fs rootwait +define Device/itus_shield-router + DEVICE_VENDOR := Itus Networks + DEVICE_MODEL := Shield Router + CMDLINE := $(ITUSROUTER_CMDLINE) + IMAGE/sysupgrade.tar/squashfs += | append-metadata +endef +TARGET_DEVICES += itus_shield-router + ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait define Device/ubnt_edgerouter DEVICE_VENDOR := Ubiquiti diff --git a/target/linux/octeon/patches-5.4/130-itus_shield_support.patch b/target/linux/octeon/patches-5.4/130-itus_shield_support.patch new file mode 100644 index 0000000000..37c75bbcd1 --- /dev/null +++ b/target/linux/octeon/patches-5.4/130-itus_shield_support.patch @@ -0,0 +1,42 @@ +--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h ++++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h +@@ -297,7 +297,7 @@ enum cvmx_board_types_enum { + CVMX_BOARD_TYPE_UBNT_E100 = 20002, + CVMX_BOARD_TYPE_UBNT_E200 = 20003, + CVMX_BOARD_TYPE_UBNT_E220 = 20005, +- CVMX_BOARD_TYPE_CUST_DSR1000N = 20006, ++ CVMX_BOARD_TYPE_ITUS_SHIELD = 20006, + CVMX_BOARD_TYPE_KONTRON_S1901 = 21901, + CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000, + +@@ -400,7 +400,7 @@ static inline const char *cvmx_board_typ + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220) +- ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N) ++ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX) + } +--- a/arch/mips/cavium-octeon/octeon-platform.c ++++ b/arch/mips/cavium-octeon/octeon-platform.c +@@ -771,7 +771,7 @@ int __init octeon_prune_device_tree(void + if (fdt_check_header(initial_boot_params)) + panic("Corrupt Device Tree."); + +- WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N, ++ WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_ITUS_SHIELD, + "Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.", + cvmx_board_type_to_string(octeon_bootinfo->board_type)); + +--- a/arch/mips/pci/pci-octeon.c ++++ b/arch/mips/pci/pci-octeon.c +@@ -211,8 +211,6 @@ const char *octeon_get_pci_interrupts(vo + return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; + case CVMX_BOARD_TYPE_BBGW_REF: + return "AABCD"; +- case CVMX_BOARD_TYPE_CUST_DSR1000N: +- return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"; + case CVMX_BOARD_TYPE_THUNDER: + case CVMX_BOARD_TYPE_EBH3000: + default: From e38d89ea55ec8da3f94c2dbb80ed5d75f8e41c20 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 01:22:36 +0200 Subject: [PATCH 07/16] at91: drop obsolete empty Makefiles This files have been emptied during subtarget consolidation, but not removed. Remove them now. Fixes: aff084adf339 ("at91: Merge SAMA5 subtargets") Signed-off-by: Adrian Schmutzler --- target/linux/at91/image/sama5d3.mk | 0 target/linux/at91/image/sama5d4.mk | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 target/linux/at91/image/sama5d3.mk delete mode 100644 target/linux/at91/image/sama5d4.mk diff --git a/target/linux/at91/image/sama5d3.mk b/target/linux/at91/image/sama5d3.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/linux/at91/image/sama5d4.mk b/target/linux/at91/image/sama5d4.mk deleted file mode 100644 index e69de29bb2..0000000000 From 03cdbb20404410ef9cd0daea45fe3f17e1b745b5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 14:57:52 +0200 Subject: [PATCH 08/16] ramips: fix LED labels for Asus RT-AC65P The leds block was copied over from the RT-AC85P DTS to the common DTSI while keeping the device-specific model name in the label. This moves the LEDs back to the DTS files and adjusts the names to properly resemble the model name of the devices used at, just like it is handled on most other devices. Fixes: 7c5f712e4fec ("ramips: add support for Asus RT-AC65P") Signed-off-by: Adrian Schmutzler --- .../linux/ramips/dts/mt7621_asus_rt-ac65p.dts | 28 +++++++++++++++++++ .../linux/ramips/dts/mt7621_asus_rt-ac85p.dts | 28 +++++++++++++++++++ .../ramips/dts/mt7621_asus_rt-acx5p.dtsi | 27 ------------------ .../etc/uci-defaults/04_led_migration | 3 ++ 4 files changed, 59 insertions(+), 27 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts index 07a714a840..eaa82012c2 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts @@ -6,4 +6,32 @@ / { compatible = "asus,rt-ac65p", "mediatek,mt7621-soc"; model = "ASUS RT-AC65P"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "rt-ac65p:blue:power"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + wlan5g { + label = "rt-ac65p:blue:wlan5g"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + + wlan2g { + label = "rt-ac65p:blue:wlan2g"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts index add33bf2d1..28928b1d4c 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts @@ -6,4 +6,32 @@ / { compatible = "asus,rt-ac85p", "mediatek,mt7621-soc"; model = "ASUS RT-AC85P"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "rt-ac85p:blue:power"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + wlan5g { + label = "rt-ac85p:blue:wlan5g"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + + wlan2g { + label = "rt-ac85p:blue:wlan2g"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi index 0921a477e9..f31e74b051 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi +++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi @@ -6,13 +6,6 @@ #include / { - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - keys { compatible = "gpio-keys"; @@ -28,26 +21,6 @@ linux,code = ; }; }; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "rt-ac85p:blue:power"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - wlan2g { - label = "rt-ac85p:blue:wlan2g"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0radio"; - }; - - wlan5g { - label = "rt-ac85p:blue:wlan5g"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; - }; - }; }; &i2c { diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration index f9cf3eae0a..4b298654b6 100644 --- a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration @@ -5,6 +5,9 @@ board=$(board_name) boardonly="${board##*,}" case "$board" in +asus,rt-ac65p) + migrate_leds "^rt-ac85p:=rt-ac65p:" + ;; mikrotik,routerboard-750gr3) migrate_leds "^rb750gr3:=$boardonly:" ;; From 8484a764df20cdd673c74b583bfbf71e10c02726 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 14 Aug 2020 15:09:29 +0200 Subject: [PATCH 09/16] ath79: ar724x: make sure builtin-switch is enabled in DT On ar7240/ar7241 the mdioX node with the builtin-switch is enabled in the DTSI files, but the parent ethX node is left disabled. It only gets enabled per device or device family, and has not been enabled at all yet for the TP-Link WA devices with ar7240, making the switch unavailable there. This patch makes sure ð0/ð1 nodes are enabled together with the &mdio0/&mdio1 nodes containing the builtin-switch. For ar7240_tplink_tl-wa.dtsi, ð0 is properly hidden again via compatible = "syscon", "simple-mfd"; This partially fixes FS#2887, however it seems dmesg still does not show cable (dis)connect in dmesg for ar7240 TP-Link WA devices. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7240.dtsi | 2 ++ target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts | 2 -- target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts | 4 ---- target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts | 2 -- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 2 -- target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi | 4 ++++ target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi | 2 -- target/linux/ath79/dts/ar7241.dtsi | 2 ++ target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts | 3 +-- target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi | 3 +-- target/linux/ath79/dts/ar7241_tplink.dtsi | 2 -- target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts | 2 -- target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 2 -- 13 files changed, 10 insertions(+), 22 deletions(-) diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 5382a710f9..730c509d7b 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -59,6 +59,8 @@ }; ð0 { + status = "okay"; + compatible = "qca,ar7240-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts index a2d3a99430..cd61bdb45f 100644 --- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts +++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts @@ -156,8 +156,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x120c>; }; diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts index 537a99b8db..22a1aeb0dc 100644 --- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts +++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts @@ -139,10 +139,6 @@ }; }; -ð0 { - status = "okay"; -}; - ð1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts index c231f4721c..8ae2a128ee 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -174,8 +174,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index a7e6b49c1f..e270dfa5c2 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -106,8 +106,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi index ac5a4d5ee9..7f671ee4bf 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi @@ -9,6 +9,10 @@ }; }; +ð0 { + compatible = "syscon", "simple-mfd"; +} + ð1 { mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi index 7621b1d53c..5ceada8375 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi @@ -30,8 +30,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <(-1)>; }; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 59fcd05f5e..4044cdee0e 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -77,6 +77,8 @@ }; ð1 { + status = "okay"; + compatible = "qca,ar7241-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts index 4d080c82f8..b4765d1a14 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -183,9 +183,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi index 49b869f718..afd521b670 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi @@ -159,9 +159,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index bb5d6d95da..f83985cc56 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -103,8 +103,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts index 4d2741fbe6..72913bfa2d 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts +++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts @@ -150,8 +150,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index e7369f0dbf..4bccdd2e4c 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -126,7 +126,5 @@ }; ð1 { - status = "okay"; - compatible = "syscon", "simple-mfd"; }; From 57e029ba573bb6b4e19c90d55960bed0357c321b Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 14 Aug 2020 16:31:40 +0200 Subject: [PATCH 10/16] ipq806x: move further common nodes to the DTSI files The moves a few additional common nodes to the common DTSI files for qcom-ipq8064-v2.0 and qcom-ipq8065 devices. Remove a few redundant definitions on the way. Signed-off-by: Adrian Schmutzler --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 7 ----- .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 7 ----- .../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 24 ---------------- .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 25 ----------------- .../arm/boot/dts/qcom-ipq8064-ea7500-v1.dts | 28 +------------------ .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 24 ---------------- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 7 ----- .../arm/boot/dts/qcom-ipq8064-r7500v2.dts | 22 --------------- .../arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 26 +++++++++++++++++ .../arm/boot/dts/qcom-ipq8064-vr2600v.dts | 24 ---------------- .../arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 19 ------------- .../arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 17 ----------- .../arm/boot/dts/qcom-ipq8065-nbg6817.dts | 24 ---------------- .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 25 ----------------- .../arch/arm/boot/dts/qcom-ipq8065.dtsi | 26 +++++++++++++++++ 15 files changed, 53 insertions(+), 252 deletions(-) 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 a23f3da469..a28927cde7 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,13 +28,6 @@ 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"; 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 59c06dbccc..f86f61f5ca 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,13 +36,6 @@ }; }; -/* -* 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"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index c6d7da3917..1f2cd247b6 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; @@ -175,20 +165,6 @@ }; }; -&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 { qcom,mode = ; status = "okay"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index 5bd195955a..dc25a42403 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; @@ -152,26 +142,11 @@ }; }; -&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. - */ -}; - &sata_phy { status = "okay"; }; &sata { - ports-implemented = <0x1>; status = "okay"; }; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts index 6454fae7f7..8001b17e81 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts @@ -12,19 +12,7 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { - serial0 = &gsbi4_serial; - led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -33,7 +21,7 @@ chosen { bootargs = "console=ttyMSM0,115200n8"; - stdout-path = "serial0:115200n8"; + append-rootblock = "ubi.mtd="; /* append to bootargs adding the root deviceblock nbr from bootloader */ find-rootblock = "ubi.mtd="; /* look for root deviceblock nbr in this bootarg */ }; @@ -89,20 +77,6 @@ }; }; -&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. - */ -}; - &usb3_0 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index 7110f8943a..9c5d163919 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; @@ -102,20 +92,6 @@ }; }; -&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. - */ -}; - &sata_phy { status = "okay"; }; 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 c1fb3b5534..868d1e9a9a 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,13 +133,6 @@ }; }; -/* -* 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"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 015de3d2b1..8cb6376ee7 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -12,14 +12,6 @@ }; reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - rsvd@5fe00000 { reg = <0x5fe00000 0x200000>; reusable; @@ -161,20 +153,6 @@ }; }; -&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. - */ -}; - &sata_phy { status = "okay"; }; 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 c0bcee783d..350965200b 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 @@ -8,6 +8,32 @@ chosen { stdout-path = "serial0:115200n8"; }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; +}; + +&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. + */ }; &CPU_SPC { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index 5de089eab4..8cc69bca88 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; @@ -164,20 +154,6 @@ }; }; -&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 { qcom,mode = ; status = "okay"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts index f8a0d07016..322968dfdb 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; @@ -187,15 +177,6 @@ }; }; -&gsbi4 { - status = "okay"; - qcom,mode = ; -}; - -&gsbi4_serial { - status = "okay"; -}; - &gsbi5 { status = "okay"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index 557ea61452..812757131a 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -12,16 +12,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { led-boot = &power; led-failsafe = &diag; @@ -245,14 +235,7 @@ }; }; -&gsbi4 { - status = "okay"; - qcom,mode = ; -}; - &gsbi4_serial { - status = "okay"; - pinctrl-0 = <&uart0_pins>; pinctrl-names = "default"; }; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 02cb4dc7e8..dab5c4ccd5 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -11,16 +11,6 @@ device_type = "memory"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - }; - aliases { mdio-gpio0 = &mdio0; sdcc1 = &sdcc1; @@ -172,20 +162,6 @@ }; }; -&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 { qcom,mode = ; status = "okay"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index f7cc8643f1..7b272b74ca 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -12,14 +12,6 @@ }; reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - rsvd@41200000 { - reg = <0x41200000 0x300000>; - no-map; - }; - rsvd@5fe00000 { reg = <0x5fe00000 0x200000>; reusable; @@ -234,22 +226,6 @@ }; }; -&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. - */ -}; - &nand_controller { status = "okay"; @@ -416,7 +392,6 @@ }; &sata { - ports-implemented = <0x1>; status = "okay"; }; 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 0a58c97095..b706bfa3a7 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 @@ -17,6 +17,32 @@ qcom,l2-cpufreq = <384000000 600000000 1400000000>; }; }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; +}; + +&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. + */ }; &pcie0 { From 48c3d5c884fe2b633066dd3119a4694cc5195b54 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 16 Aug 2020 02:07:14 +0200 Subject: [PATCH 11/16] ath79: change WPS to Wifi button on TL-WPA8630P v2 Both TL-WPA8630(P) v1 and v2 feature a button labelled "WiFi". While this is implemented as KEY_RFKILL for v1 in ar71xx and ath79, the v2 sets it up as WPS button. According to the manual, the behavior in OEM firmware is: "Press and hold the button for 1 second to copy wireless settings from the main router to the extender. Go to Wi-Fi Clone for more information. Press and hold the button for at least 5 seconds to turn the wireless function on or off." Consequently, and since this is historic behavior on v1 in OpenWrt, we set this button to KEY_RFKILL on both revisions. Fixes: ab74def0db93 ("ath79: add support for TP-Link TL-WPA8630P v2") Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts | 9 --------- target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi | 9 ++++++++- .../linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi | 9 --------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts index 8912e2fc7c..0dd14896f0 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts @@ -12,15 +12,6 @@ }; }; -&keys { - wifi { - label = "WiFi button"; - linux,code = ; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; -}; - &partitions { uboot: partition@0 { label = "u-boot"; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi index 68b455c66a..1f16f9a617 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi @@ -13,7 +13,7 @@ led-upgrade = &led_power; }; - keys: keys { + keys { compatible = "gpio-keys"; reset { @@ -36,6 +36,13 @@ gpios = <&gpio 7 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; + + wifi { + label = "WiFi button"; + linux,code = ; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; }; leds { diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi index 97eeb45d65..2389fe9734 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi @@ -17,15 +17,6 @@ }; }; -&keys { - wps { - label = "WPS button"; - linux,code = ; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; -}; - &partitions { partition@0 { label = "factory-uboot"; From e329e71c6915ffdf7fe99efc323a6de7867d0cbe Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 18:26:55 +0200 Subject: [PATCH 12/16] ath79: fix syntax error in ar7240_tplink_tl-wa.dtsi The node needs to be terminated by a semicolon. Fixes: 8484a764df20 ("ath79: ar724x: make sure builtin-switch is enabled in DT") Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi index 7f671ee4bf..7ec0469dcd 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi @@ -11,7 +11,7 @@ ð0 { compatible = "syscon", "simple-mfd"; -} +}; ð1 { mtd-mac-address = <&uboot 0x1fc00>; From 1a75443964558e67a29fac28ded9a15dbb715034 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 23:09:37 +0200 Subject: [PATCH 13/16] apm821xx: tidy up 10-fix-wifi-mac This applies some cosmetic style fixes: - remove useless echo - remove double equal sign (specific to bash) - add quotes for -n check Signed-off-by: Adrian Schmutzler --- .../base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 597b5dcca6..a78a1054f1 100644 --- a/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -1,10 +1,10 @@ #!/bin/ash -[ "$ACTION" == "add" ] || exit 0 +[ "$ACTION" = "add" ] || exit 0 PHYNBR=${DEVPATH##*/phy} -[ -n $PHYNBR ] || exit 0 +[ -n "$PHYNBR" ] || exit 0 . /lib/functions.sh . /lib/functions/system.sh @@ -14,7 +14,7 @@ board=$(board_name) case "$board" in netgear,wndap620|\ netgear,wndap660) - echo $(macaddr_add $(mtd_get_mac_ascii u-boot-env baseMAC) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress + macaddr_add $(mtd_get_mac_ascii u-boot-env baseMAC) $(($PHYNBR + 1)) > /sys${DEVPATH}/macaddress ;; *) ;; From 84fc80dd668a053c84b1431e5a98995abb0710ea Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 23:13:57 +0200 Subject: [PATCH 14/16] rockchip: remove useless echo in 40-net-smp-affinity The command in the $() brackets will already provide the same output. Signed-off-by: Adrian Schmutzler --- .../armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity index ab3f954654..44716258bf 100644 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity @@ -6,7 +6,7 @@ get_device_irq() { local device="$1" local line=$(grep -m 1 "${device}\$" /proc/interrupts) - echo $(echo ${line} | sed 's/:.*//') + echo ${line} | sed 's/:.*//' } set_interface_core() { From b1f6a5d9dffd8da30800e9e66ea772554bbba778 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 23:16:58 +0200 Subject: [PATCH 15/16] bcm53xx: remove useless echo in 02_network The output is already produced in the inner $() brackets, no need to catch and echo it again. Signed-off-by: Adrian Schmutzler --- target/linux/bcm53xx/base-files/etc/board.d/02_network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network index b3d614d6a2..6774e5bf46 100755 --- a/target/linux/bcm53xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network @@ -55,8 +55,8 @@ bcm53xx_setup_interfaces() # vlan2ports=4 5u # and early Netgear R8000 was using # vlan1ports=3 2 1 0 5 7 8* - vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))" - vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))" + vlan1ports="$(nvram get vlan1ports | tr " " "\n" | sort)" + vlan2ports="$(nvram get vlan2ports | tr " " "\n" | sort)" if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \ echo "$vlan2ports" | egrep -q "^0 5"; then ucidef_add_switch "switch0" \ From 18ab496c3231731afbb3390b905f7498fd3488f8 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 17 Aug 2020 23:23:37 +0200 Subject: [PATCH 16/16] ltq-dsl-base: remove useless echos in lantiq_dsl.sh The is no reason to catch the output by $() and then echo it again. Remove the useless echos. Signed-off-by: Adrian Schmutzler --- package/network/utils/ltq-dsl-base/Makefile | 2 +- .../utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/ltq-dsl-base/Makefile b/package/network/utils/ltq-dsl-base/Makefile index 6b931f7abd..e2cfc4004c 100644 --- a/package/network/utils/ltq-dsl-base/Makefile +++ b/package/network/utils/ltq-dsl-base/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ltq-dsl-base -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh index 11b02fc4aa..5842a7879f 100755 --- a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh +++ b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh @@ -19,10 +19,10 @@ dsl_cmd() { ) } dsl_val() { - echo $(expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*') + expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*' } dsl_string() { - echo $(expr "$1" : '.*'$2'=(\([A-Z0-9,]*\))') + expr "$1" : '.*'$2'=(\([A-Z0-9,]*\))' } #