realtek: fix model for TP-Link TL-ST1008F v2.0

Fix the model name in DTS compatible, Makefiles and board scripts by
using dash instead of comma or underscore. This aligns it with other
examples in OpenWrt and makes in consistent in all places where the
board model is used.

'tplink,tl-st1008f,v2' --> 'tplink,tl-st1008f-v2'
'tplink,tl-st1008f_v2' --> 'tplink,tl-st1008f-v2'

Fixes: 39b9b491bb ("realtek: add support for TP-Link TL-ST1008F v2.0")
Fixes: #19930
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19934
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index dd2456d9dc10bcc5d3c3c7ec4ec29107986cffb0..0586e9e3960b3d213ee940834438660cc79eb15d 100644 (file)
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -56,7 +56,7 @@ tplink,t1600g-28ts-v3)
        label_mac=$(get_mac_label)
        lan_mac="$label_mac"
        ;;
-tplink,tl-st1008f,v2)
+tplink,tl-st1008f-v2)
        lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
        [ -z "$lan_mac" ] || [ "$lan_mac" = "00:e0:4c:00:00:00" ] && lan_mac=$(macaddr_random)
        ;;

diff --git a/target/linux/realtek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr b/target/linux/realtek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr
index adb54da9566f4501b50f6a18968ec10ca1471226..c2684223895ff75fda990e9c00287ae395c4b1c4 100644 (file)
--- a/target/linux/realtek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr
+++ b/target/linux/realtek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr
@@ -10,7 +10,7 @@ BOARD_CFG=/etc/board.json
 [ "$(rootfs_type)" = "tmpfs" ] && exit 0
 
 case "$(board_name)" in
-tplink,tl-st1008f,v2)
+tplink,tl-st1008f-v2)
        env_ethaddr=$(macaddr_canonicalize "$(fw_printenv -n ethaddr 2>/dev/null)")
 
        # This device ships with a dummy ethaddr because it's an unmanaged switch.

diff --git a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f_v2.dts b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
similarity index 99%
rename from target/linux/realtek/dts/rtl9303_tplink_tl-st1008f_v2.dts
rename to target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
index 49d7b348d552fe2e010fb21f7e7a9df378ce7bb8..83f999879504bbd9b63c45b8fffccbb72260e98e 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f_v2.dts
+++ b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
@@ -7,7 +7,7 @@
 #include <dt-bindings/leds/common.h>
 
 / {
-       compatible = "tplink,tl-st1008f,v2", "realtek,rtl930x-soc";
+       compatible = "tplink,tl-st1008f-v2", "realtek,rtl930x-soc";
        model = "TP-Link TL-ST1008F v2.0";
 
        memory@0 {

diff --git a/target/linux/realtek/image/rtl930x.mk b/target/linux/realtek/image/rtl930x.mk
index 8f53855b5bccfe5e164e211817fd95b09c064d04..cf7333e3d4c428eab9c6cefc7f45a439f0dc11f8 100644 (file)
--- a/target/linux/realtek/image/rtl930x.mk
+++ b/target/linux/realtek/image/rtl930x.mk
@@ -40,17 +40,18 @@ define Device/plasmacloud_psx10
 endef
 TARGET_DEVICES += plasmacloud_psx10
 
-define Device/tplink_tl-st1008f_v2
+define Device/tplink_tl-st1008f-v2
   SOC := rtl9303
   UIMAGE_MAGIC := 0x93030000
   DEVICE_VENDOR := TP-Link
   DEVICE_MODEL := TL-ST1008F
   DEVICE_VARIANT := v2.0
   DEVICE_PACKAGES := kmod-gpio-pca953x
+  SUPPORTED_DEVICES += tplink,tl-st1008f,v2
   IMAGE_SIZE := 31808k
   $(Device/kernel-lzma)
 endef
-TARGET_DEVICES += tplink_tl-st1008f_v2
+TARGET_DEVICES += tplink_tl-st1008f-v2
 
 define Device/vimin_vm-s100-0800ms
   SOC := rtl9303