From 0abf2c081c58900b41d9d8c729f8baf19e6b5ebf Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 27 Sep 2020 10:05:18 +0200 Subject: [PATCH 1/7] linux-firmware: update to 20200918 00a84c5 linux-firmware: Update AMD SEV firmware 71338c2 Merge branch 'for-master' of https://github.com/CosmicPenguin/linux-firmware into main 07367b9 linux-firmware: Update firmware file for Intel Bluetooth AX200 1d1586a linux-firmware: Update firmware file for Intel Bluetooth AX201 28b333d linux-firmware: Update firmware file for Intel Bluetooth 9560 db30380 linux-firmware: Update firmware file for Intel Bluetooth 9260 eb3aa1f Mellanox: Add new mlxsw_spectrum firmware xx.2008.1310 ec88f05 mediatek: update MT7915 firmware to 20200819 a9993f8 brcm: Fix a stale symlink for RPi3 model b+ f48fec4 qcom: Add updated a5xx and a6xx microcode d5f9eea wl18xx: update firmware file 8.9.0.0.83 7a237c6 linux-firmware: mt7615: update firmware to 20200814 version 74bd44f amdgpu: add navi12 firmware from 20.30 b9f69cd amdgpu: update navi10 firmware for 20.30 Signed-off-by: David Bauer --- package/firmware/linux-firmware/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 7dbcbdd8a3..d167400014 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20200817 -PKG_RELEASE:=2 +PKG_VERSION:=20200918 +PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=76d05d5f1eff268d3b80675245fa596f557bd55ee2e16ddd54d18ffeae943887 +PKG_HASH:=e2787907e0892e0b1a3c06f1def6fd3cdc0eff850b0919c7f21b5bda7563d2d8 PKG_MAINTAINER:=Felix Fietkau From 5b5469f87a56b593897ed43c492120e61e19a3b8 Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Fri, 25 Sep 2020 14:00:40 -0400 Subject: [PATCH 2/7] rockchip: add support for Radxa Rock Pi 4 This adds basic support for Radxa Rock Pi 4 Specification: - RAM: 1 GB/ 2 GB/4 GB LPDDR4 - SoC: Rockchip RK3399 - CPU: 64bit hexa core processor Dual Cortex-A72, freqency 1.8Ghz with quad Cortex-A53, frequency 1.4Ghz - USB: USB 3.0 OTG x1 hardware switch for host/device switch, upper one USB 3.0 HOST x1 dedicated USB3.0 channel, lower one USB 2.0 HOST x2 - Ethernet: 1x GbE - Storage: eMMC module uSD card M.2 SSD - Wireless: 802.11 ac wifi Bluetooth 5.0 currently not supported firmware Installation ====================== gzip -d xxx.img.gz, then dd the .img to SD/eMMC ====================== Device Tested: ROCK PI 4 Model B v1.3 Signed-off-by: Marty Jones --- target/linux/rockchip/image/armv8.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 6ba9874abf..4a46cb7336 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -23,3 +23,12 @@ define Device/pine64_rockpro64 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata endef TARGET_DEVICES += pine64_rockpro64 + +define Device/radxa_rock-pi-4 + DEVICE_VENDOR := Radxa + DEVICE_MODEL := Rock Pi 4 + SOC := rk3399 + UBOOT_DEVICE_NAME := rock-pi-4-rk3399 + IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata +endef +TARGET_DEVICES += radxa_rock-pi-4 From 6cc99c656d4723a31362d59f0427e0314ce9e9c0 Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Thu, 1 Oct 2020 03:04:48 -0400 Subject: [PATCH 3/7] uboot-rockchip: add Rock Pi 4 support Add support for the Raxda Rock Pi 4. Signed-off-by: Marty Jones --- package/boot/uboot-rockchip/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index d460e3723e..944c942efc 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -38,6 +38,16 @@ endef # RK3399 boards +define U-Boot/rock-pi-4-rk3399 + BUILD_SUBTARGET:=armv8 + NAME:=Rock Pi 4 + BUILD_DEVICES:= \ + radxa_rock-pi-4 + DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip + PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip + ATF:=rk3399_bl31.elf +endef + define U-Boot/rockpro64-rk3399 BUILD_SUBTARGET:=armv8 NAME:=RockPro64 @@ -49,6 +59,7 @@ define U-Boot/rockpro64-rk3399 endef UBOOT_TARGETS := \ + rock-pi-4-rk3399 \ rockpro64-rk3399 \ nanopi-r2s-rk3328 From 929e8f0f553637076f2612fb1c2225c5cee1f7ab Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 26 Aug 2020 15:39:54 +0200 Subject: [PATCH 4/7] ramips: fix logic level for DIR-645 buttons The D-Link DIR-645 currently uses an incorrect logic level for its buttons. Correct them in order to prevent unintentional activation of failsafe mode. Reported-by: Perry Melange Signed-off-by: David Bauer --- target/linux/ramips/dts/rt3662_dlink_dir-645.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 778ee3c1e7..23313759c7 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -27,13 +27,13 @@ reset { label = "reset"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; linux,code = ; }; wps { label = "wps"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; linux,code = ; }; }; From 4950071d307717b1d3eeb5e7c3fbdff3c601c574 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 4 Sep 2020 09:30:49 +0200 Subject: [PATCH 5/7] omap: update uboot to v2020.04 Fixes the build error: /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status Successfully tested on boneblack. Signed-off-by: Andre Heider --- package/boot/uboot-omap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile index 70c8af1dc4..f66b8d5331 100644 --- a/package/boot/uboot-omap/Makefile +++ b/package/boot/uboot-omap/Makefile @@ -8,10 +8,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2019.10 +PKG_VERSION:=2020.04 PKG_RELEASE:=1 -PKG_HASH:=8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk From 7422c7a6fa2eb5f02f9bd7fa9d63ebe8514f88ff Mon Sep 17 00:00:00 2001 From: Joe Mullally Date: Sat, 12 Sep 2020 19:46:28 +0100 Subject: [PATCH 6/7] ath79: add support for TP-Link TL-WPA8630P (EU) v2.1 This adds support for the TP-Link TL-WPA8630P (EU) in its v2.1 version. The only unique aspect for the firmware compared to v2 layout is the partition layout. Note that while the EU version has different partitioning for v2.0 and v2.1, the v2.1 (AU) is supported by the v2-int image. If you plan to use this device, make sure you have a look at the Wiki page to check whether the device is supported and which image needs to be taken. Specifications -------------- - QCA9563 750MHz, 2.4GHz WiFi - QCA9888 5GHz WiFi - 8MiB SPI Flash - 128MiB RAM - 3 GBit Ports (QCA8337) - PLC (QCA7550) Installation ------------ Installation is possible from the OEM web interface. Make sure to install the latest OEM firmware first, so that the PLC firmware is at the latest version. However, please also check the Wiki page for hints according to altered partitioning between OEM firmware revisions. Notes ----- The OEM firmware has 0x620000 to 0x680000 unassigned, so we leave this empty as well. It is complicated enough already ... Signed-off-by: Joe Mullally [improve partitions, use v2 DTSI, add entry in 02_network, rewrite and extend commit message] Signed-off-by: Adrian Schmutzler --- .../dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts | 6 ++++ .../dts/qca9563_tplink_tl-wpa8630p-v2-int.dts | 6 ++++ .../qca9563_tplink_tl-wpa8630p-v2.1-eu.dts | 30 ++++++++++++++++ .../dts/qca9563_tplink_tl-wpa8630p-v2.dtsi | 6 ---- .../generic/base-files/etc/board.d/01_leds | 3 +- .../generic/base-files/etc/board.d/02_network | 3 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 3 +- target/linux/ath79/image/generic-tp-link.mk | 7 ++++ tools/firmware-utils/Makefile | 2 +- tools/firmware-utils/src/tplink-safeloader.c | 35 +++++++++++++++++++ 10 files changed, 91 insertions(+), 10 deletions(-) create mode 100644 target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts index 4c04d4f96e..48cc5ed32f 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts @@ -8,6 +8,12 @@ }; &partitions { + partition@620000 { + label = "partition-table"; + reg = <0x620000 0x010000>; + read-only; + }; + info: partition@630000 { label = "info"; reg = <0x630000 0x010000>; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts index 22a8082011..50a88f344a 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts @@ -8,6 +8,12 @@ }; &partitions { + partition@620000 { + label = "partition-table"; + reg = <0x620000 0x010000>; + read-only; + }; + partition@630000 { label = "tplink"; reg = <0x630000 0x1b0000>; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts new file mode 100644 index 0000000000..e8d92419c6 --- /dev/null +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca9563_tplink_tl-wpa8630p-v2.dtsi" + +/ { + compatible = "tplink,tl-wpa8630p-v2.1-eu", "qca,qca9563"; + model = "TP-Link WPA8630P v2.1 (EU)"; +}; + +&partitions { + /* 0x620000 to 0x680000 is empty in OEM partitioning */ + + partition@680000 { + label = "tplink"; + reg = <0x680000 0x160000>; + read-only; + }; + + info: partition@7e0000 { + label = "info"; + reg = <0x7e0000 0x010000>; + read-only; + }; + + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x010000>; + read-only; + }; +}; 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 be691a843b..9e6d23de4e 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi @@ -26,12 +26,6 @@ label = "firmware"; reg = <0x040000 0x5e0000>; }; - - partition@620000 { - label = "partition-table"; - reg = <0x620000 0x010000>; - read-only; - }; }; ð0 { diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index b759bfb5f6..c812f283af 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -324,7 +324,8 @@ tplink,tl-mr6400-v1) ;; tplink,tl-wpa8630-v1|\ tplink,tl-wpa8630p-v2-eu|\ -tplink,tl-wpa8630p-v2-int) +tplink,tl-wpa8630p-v2-int|\ +tplink,tl-wpa8630p-v2.1-eu) ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x3c" ;; tplink,tl-wr842n-v2) 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 5d23e0589e..58ff2aa6eb 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 @@ -324,7 +324,8 @@ ath79_setup_interfaces() ;; tplink,tl-wpa8630-v1|\ tplink,tl-wpa8630p-v2-eu|\ - tplink,tl-wpa8630p-v2-int) + tplink,tl-wpa8630p-v2-int|\ + tplink,tl-wpa8630p-v2.1-eu) # port 5 (internal) is the power-line port ucidef_add_switch "switch0" \ "0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "5:lan:4" 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 89a64fbf35..248b436c72 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 @@ -198,7 +198,8 @@ case "$FIRMWARE" in ;; tplink,eap225-wall-v2|\ tplink,tl-wpa8630p-v2-eu|\ - tplink,tl-wpa8630p-v2-int) + tplink,tl-wpa8630p-v2-int|\ + tplink,tl-wpa8630p-v2.1-eu) caldata_extract "art" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 22d1ac8a9e..a2fbf712db 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -564,6 +564,13 @@ define Device/tplink_tl-wpa8630p-v2-int endef TARGET_DEVICES += tplink_tl-wpa8630p-v2-int +define Device/tplink_tl-wpa8630p-v2.1-eu + $(Device/tplink_tl-wpa8630p-v2) + DEVICE_VARIANT := v2.1 (EU) + TPLINK_BOARD_ID := TL-WPA8630P-V2.1-EU +endef +TARGET_DEVICES += tplink_tl-wpa8630p-v2.1-eu + define Device/tplink_tl-wr1043nd-v1 $(Device/tplink-8m) SOC := ar9132 diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index 39c3503886..7f1754a347 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME := firmware-utils -PKG_RELEASE := 3 +PKG_RELEASE := 4 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 82166a9ebb..eececeaf61 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -1513,6 +1513,41 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system" }, + /** Firmware layout for the TL-WPA8630P v2.1 (EU)*/ + { + .id = "TL-WPA8630P-V2.1-EU", + .vendor = "", + .support_list = + "SupportList:\n" + "{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n", + .support_trail = '\x00', + .soft_ver = NULL, + + .partitions = { + {"factory-uboot", 0x00000, 0x20000}, + {"fs-uboot", 0x20000, 0x20000}, + {"firmware", 0x40000, 0x5e0000}, + {"extra-para", 0x680000, 0x01000}, + {"product-info", 0x690000, 0x01000}, + {"partition-table", 0x6a0000, 0x02000}, + {"soft-version", 0x6b0000, 0x01000}, + {"support-list", 0x6b1000, 0x01000}, + {"profile", 0x6b2000, 0x08000}, + {"user-config", 0x6c0000, 0x10000}, + {"default-config", 0x6d0000, 0x10000}, + {"default-nvm", 0x6e0000, 0xc0000}, + {"default-pib", 0x7a0000, 0x40000}, + {"default-mac", 0x7e0000, 0x00020}, + {"pin", 0x7e0100, 0x00020}, + {"device-id", 0x7e0200, 0x00030}, + {"radio", 0x7f0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system" + }, + /** Firmware layout for the TL-WR1043 v5 */ { .id = "TLWR1043NV5", From e3af1666f4f735ca36d17a6b8d0a97e2f23c2cda Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 28 Sep 2020 14:31:02 +0200 Subject: [PATCH 7/7] ath79: rename TP-Link TL-WPA8630P v2 (EU) to v2.0 (EU) Since we have a v2.1 (EU) with different partitioning now, rename the v2.0 to make the difference visible to the user more directly. Signed-off-by: Adrian Schmutzler --- ...dts => qca9563_tplink_tl-wpa8630p-v2.0-eu.dts} | 4 ++-- .../ath79/generic/base-files/etc/board.d/01_leds | 2 +- .../generic/base-files/etc/board.d/02_network | 2 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- target/linux/ath79/image/generic-tp-link.mk | 15 ++++++++------- tools/firmware-utils/src/tplink-safeloader.c | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) rename target/linux/ath79/dts/{qca9563_tplink_tl-wpa8630p-v2-eu.dts => qca9563_tplink_tl-wpa8630p-v2.0-eu.dts} (83%) diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts similarity index 83% rename from target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts rename to target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts index 48cc5ed32f..9eff2fcf68 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts @@ -3,8 +3,8 @@ #include "qca9563_tplink_tl-wpa8630p-v2.dtsi" / { - compatible = "tplink,tl-wpa8630p-v2-eu", "qca,qca9563"; - model = "TP-Link WPA8630P v2 (EU)"; + compatible = "tplink,tl-wpa8630p-v2.0-eu", "qca,qca9563"; + model = "TP-Link WPA8630P v2.0 (EU)"; }; &partitions { diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index c812f283af..cc5a930531 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -323,8 +323,8 @@ tplink,tl-mr6400-v1) ucidef_set_led_netdev "4g" "4G" "white:4g" "usb0" ;; tplink,tl-wpa8630-v1|\ -tplink,tl-wpa8630p-v2-eu|\ tplink,tl-wpa8630p-v2-int|\ +tplink,tl-wpa8630p-v2.0-eu|\ tplink,tl-wpa8630p-v2.1-eu) ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x3c" ;; 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 58ff2aa6eb..bed817e286 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 @@ -323,8 +323,8 @@ ath79_setup_interfaces() "0@eth0" "1:lan:1" "2:lan:3" "3:lan:2" ;; tplink,tl-wpa8630-v1|\ - tplink,tl-wpa8630p-v2-eu|\ tplink,tl-wpa8630p-v2-int|\ + tplink,tl-wpa8630p-v2.0-eu|\ tplink,tl-wpa8630p-v2.1-eu) # port 5 (internal) is the power-line port ucidef_add_switch "switch0" \ 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 248b436c72..857f566db8 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 @@ -197,8 +197,8 @@ case "$FIRMWARE" in /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; tplink,eap225-wall-v2|\ - tplink,tl-wpa8630p-v2-eu|\ tplink,tl-wpa8630p-v2-int|\ + tplink,tl-wpa8630p-v2.0-eu|\ tplink,tl-wpa8630p-v2.1-eu) caldata_extract "art" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index a2fbf712db..7979dda786 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -550,13 +550,6 @@ define Device/tplink_tl-wpa8630p-v2 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct endef -define Device/tplink_tl-wpa8630p-v2-eu - $(Device/tplink_tl-wpa8630p-v2) - DEVICE_VARIANT := v2 (EU) - TPLINK_BOARD_ID := TL-WPA8630P-V2-EU -endef -TARGET_DEVICES += tplink_tl-wpa8630p-v2-eu - define Device/tplink_tl-wpa8630p-v2-int $(Device/tplink_tl-wpa8630p-v2) DEVICE_VARIANT := v2 (Int.) @@ -564,6 +557,14 @@ define Device/tplink_tl-wpa8630p-v2-int endef TARGET_DEVICES += tplink_tl-wpa8630p-v2-int +define Device/tplink_tl-wpa8630p-v2.0-eu + $(Device/tplink_tl-wpa8630p-v2) + DEVICE_VARIANT := v2.0 (EU) + TPLINK_BOARD_ID := TL-WPA8630P-V2.0-EU + SUPPORTED_DEVICES += tplink,tl-wpa8630p-v2-eu +endef +TARGET_DEVICES += tplink_tl-wpa8630p-v2.0-eu + define Device/tplink_tl-wpa8630p-v2.1-eu $(Device/tplink_tl-wpa8630p-v2) DEVICE_VARIANT := v2.1 (EU) diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index eececeaf61..31b9c032d1 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -1443,7 +1443,7 @@ static struct device_info boards[] = { /** Firmware layout for the TL-WPA8630P v2 (EU)*/ { - .id = "TL-WPA8630P-V2-EU", + .id = "TL-WPA8630P-V2.0-EU", .vendor = "", .support_list = "SupportList:\n"