ath79: rename tplink_rex5x-v1, deduplicate RE450-v2 config

Rename Device/tplink_rex5x-v1 to tplink_rex5x. Make RE355 v1, RE450 v1,
and RE450 v2 inherit from it, removing duplicated fields from RE450 v2.

Signed-off-by: Ivan Diaz <diaz.it@icloud.com>
Link: https://github.com/openwrt/openwrt/pull/22185
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit d583294c708d1f45a03a3263707a4856688c4689)

diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 7dda52600850316efd46ff39675e720e64f5272c..90675248fe0efe13ddd2e35f08e9ae46b6957302 100644 (file)
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -1,6 +1,6 @@
 include ./common-tp-link.mk
 
-define Device/tplink_rex5x-v1
+define Device/tplink_rex5x
   $(Device/tplink-safeloader)
   SOC := qca9558
   IMAGE_SIZE := 7680k
@@ -13,7 +13,7 @@ define Device/tplink_rex5x-v1
 endef
 
 define Device/tplink_re355-v1
-  $(Device/tplink_rex5x-v1)
+  $(Device/tplink_rex5x)
   DEVICE_MODEL := RE355
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := RE355
@@ -22,7 +22,7 @@ endef
 TARGET_DEVICES += tplink_re355-v1
 
 define Device/tplink_re450-v1
-  $(Device/tplink_rex5x-v1)
+  $(Device/tplink_rex5x)
   DEVICE_MODEL := RE450
   DEVICE_VARIANT := v1
   TPLINK_BOARD_ID := RE450
@@ -31,17 +31,10 @@ endef
 TARGET_DEVICES += tplink_re450-v1
 
 define Device/tplink_re450-v2
-  $(Device/tplink-safeloader)
+  $(Device/tplink_rex5x)
   SOC := qca9563
-  IMAGE_SIZE := 7680k
-  KERNEL_SIZE := 6016k
   DEVICE_MODEL := RE450
   DEVICE_VARIANT := v2
-  DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
-  DEVICE_COMPAT_VERSION := 2.0
-  DEVICE_COMPAT_MESSAGE := Partition layout has changed compared to older versions by utilizing unused flash. \
-    Upgrade via sysupgrade mechanism (-F) will only work if flashed image still fits to the size of old partition (6016 KiB).
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
   TPLINK_BOARD_ID := RE450-V2
   LOADER_TYPE := elf
 endef