From e3af1666f4f735ca36d17a6b8d0a97e2f23c2cda Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 28 Sep 2020 14:31:02 +0200 Subject: [PATCH] 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" -- 2.30.2