From a915ad8464341c01ddd894ac36483183ab4c4130 Mon Sep 17 00:00:00 2001 From: Thomas Vincent-Cross Date: Sun, 17 Feb 2019 23:21:42 +1100 Subject: [PATCH] ramips: use generic board detection for Wavlink WL-WN575A3 Bring Wavlink WL-WN575A3 in line with other Wavlink ramips devices. Signed-off-by: Thomas Vincent-Cross --- .../linux/ramips/base-files/etc/board.d/01_leds | 10 +++++----- .../ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/lib/ramips.sh | 3 --- target/linux/ramips/image/mt76x8.mk | 17 +++++++++-------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index f19d6be6e8..cbc003a1de 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -392,16 +392,16 @@ wavlink,wl-wn570ha1) ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan0" "85" "100" set_wifi_led "$boardname:green:wifi" ;; -we1026-5g-16m) - ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" - set_wifi_led "we1026-5g:green:wifi" - ;; -wl-wn575a3) +wavlink,wl-wn575a3) ucidef_set_rssimon "wlan1" "200000" "1" ucidef_set_led_rssi "wifi-low" "wifi-low" "$boardname:green:wifi-low" "wlan1" "1" "49" ucidef_set_led_rssi "wifi-med" "wifi-med" "$boardname:green:wifi-med" "wlan1" "50" "84" ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan1" "85" "100" ;; +we1026-5g-16m) + ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" + set_wifi_led "we1026-5g:green:wifi" + ;; wrh-300cr) set_wifi_led "$boardname:green:wlan" ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index fca3398f2d..f47d6f895d 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -123,11 +123,11 @@ ramips_setup_interfaces() unielec,u7621-06-512m-64m|\ vr500|\ wavlink,wl-wn570ha1|\ + wavlink,wl-wn575a3|\ wf-2881|\ whr-g300n|\ mqmaker,witi-256m|\ mqmaker,witi-512m|\ - wl-wn575a3|\ wndr3700v5|\ youku-yk1|\ zbt-ape522ii|\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 49bed87c48..db93710ba7 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -583,9 +583,6 @@ ramips_board_detect() { *"WL-351 v1 002") name="wl-351" ;; - *"WL-WN575A3") - name="wl-wn575a3" - ;; *"WLI-TX4-AG300N") name="wli-tx4-ag300n" ;; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 0c18641ca0..99fef1b249 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -352,6 +352,15 @@ define Device/wavlink_wl-wn570ha1 endef TARGET_DEVICES += wavlink_wl-wn570ha1 +define Device/wavlink_wl-wn575a3 + DTS := WL-WN575A3 + IMAGE_SIZE := $(ralink_default_fw_size_8M) + DEVICE_TITLE := Wavlink WL-WN575A3 + DEVICE_PACKAGES := kmod-mt76x2 + SUPPORTED_DEVICES += wl-wn575a3 +endef +TARGET_DEVICES += wavlink_wl-wn575a3 + define Device/wcr-1166ds DTS := WCR-1166DS BUFFALO_TAG_PLATFORM := MTK @@ -369,14 +378,6 @@ define Device/wcr-1166ds endef TARGET_DEVICES += wcr-1166ds -define Device/wl-wn575a3 - DTS := WL-WN575A3 - IMAGE_SIZE := $(ralink_default_fw_size_8M) - DEVICE_TITLE := Wavlink WL-WN575A3 - DEVICE_PACKAGES := kmod-mt76x2 -endef -TARGET_DEVICES += wl-wn575a3 - define Device/widora_neo-16m DTS := WIDORA-NEO-16M IMAGE_SIZE := $(ralink_default_fw_size_16M)