[openwrt/openwrt] mediatek: filogic: reorder alphabetically
LEDE Commits
lede-commits at lists.infradead.org
Tue Oct 15 13:36:50 PDT 2024
dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e98987048ad73012cb29993c39c2de8682d64f9b
commit e98987048ad73012cb29993c39c2de8682d64f9b
Author: Chukun Pan <amadeus at jmu.edu.cn>
AuthorDate: Fri Sep 20 23:10:26 2024 +0800
mediatek: filogic: reorder alphabetically
Reorder scripts to keep alphabetical order.
Signed-off-by: Chukun Pan <amadeus at jmu.edu.cn>
---
.../filogic/base-files/etc/board.d/01_leds | 12 +++----
.../filogic/base-files/etc/board.d/02_network | 40 ++++++++++------------
.../filogic/base-files/lib/upgrade/platform.sh | 14 ++++----
target/linux/mediatek/image/filogic.mk | 9 +++--
4 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index 1437a120f5..dad5c293de 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -105,16 +105,16 @@ smartrg,sdg-8733a)
ucidef_set_led_netdev "wan-orange" "WAN" "mdio-bus:08:orange:wan" "wan" "link_100 link_1000"
ucidef_set_led_netdev "wan-white" "WAN" "mdio-bus:08:white:wan" "wan" "link_10000"
;;
-wavlink,wl-wn586x3)
- ucidef_set_led_netdev "lan-1" "lan-1" "blue:lan-1" "lan1" "link tx rx"
- ucidef_set_led_netdev "lan-2" "lan-2" "blue:lan-2" "lan2" "link tx rx"
- ucidef_set_led_netdev "wan" "wan" "blue:wan" "eth1" "link tx rx"
- ;;
tplink,re6000xd)
ucidef_set_led_netdev "lan-1" "lan-1" "blue:lan-0" "lan1" "link tx rx"
ucidef_set_led_netdev "lan-2" "lan-2" "blue:lan-1" "lan2" "link tx rx"
ucidef_set_led_netdev "eth1" "lan-3" "blue:lan-2" "eth1" "link tx rx"
;;
+wavlink,wl-wn586x3)
+ ucidef_set_led_netdev "lan-1" "lan-1" "blue:lan-1" "lan1" "link tx rx"
+ ucidef_set_led_netdev "lan-2" "lan-2" "blue:lan-2" "lan2" "link tx rx"
+ ucidef_set_led_netdev "wan" "wan" "blue:wan" "eth1" "link tx rx"
+ ;;
xiaomi,mi-router-wr30u-stock|\
xiaomi,mi-router-wr30u-ubootmod)
ucidef_set_led_netdev "wan" "wan" "blue:wan" "wan" "link tx rx"
@@ -132,7 +132,7 @@ zyxel,ex5601-t0-ubootmod)
ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth1" "link tx rx"
ucidef_set_led_netdev "wifi-24g" "WIFI-2.4G" "green:wifi24g" "phy0-ap0" "link tx rx"
ucidef_set_led_netdev "wifi-5g" "WIFI-5G" "green:wifi5g" "phy1-ap0" "link tx rx"
- ;;
+ ;;
esac
board_config_flush
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 40d1b504e3..af5c4ceafe 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -8,9 +8,6 @@ mediatek_setup_interfaces()
local board="$1"
case $board in
- acelink,ew-7886cax)
- ucidef_set_interface_lan "eth0" "dhcp"
- ;;
abt,asr3000|\
cmcc,rax3000m|\
h3c,magic-nx30-pro|\
@@ -18,6 +15,9 @@ mediatek_setup_interfaces()
zbtlink,zbt-z8103ax)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1
;;
+ acelink,ew-7886cax)
+ ucidef_set_interface_lan "eth0" "dhcp"
+ ;;
acer,predator-w6)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 game" eth1
;;
@@ -36,10 +36,16 @@ mediatek_setup_interfaces()
netcore,n60|\
ruijie,rg-x60-pro|\
unielec,u7981-01*|\
- zbtlink,zbt-z8102ax)
+ zbtlink,zbt-z8102ax|\
+ zyxel,ex5601-t0-stock|\
+ zyxel,ex5601-t0-ubootmod)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1
;;
- asus,tuf-ax6000)
+ asus,tuf-ax6000|\
+ glinet,gl-mt6000|\
+ tplink,tl-xdr4288|\
+ tplink,tl-xdr6088|\
+ tplink,tl-xtr8488)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
;;
bananapi,bpi-r3)
@@ -56,6 +62,13 @@ mediatek_setup_interfaces()
comfast,cf-e393ax)
ucidef_set_interfaces_lan_wan "lan1" eth1
;;
+ cudy,ap3000outdoor-v1|\
+ cudy,re3000-v1|\
+ netgear,wax220|\
+ ubnt,unifi-6-plus|\
+ zyxel,nwa50ax-pro)
+ ucidef_set_interface_lan "eth0"
+ ;;
cudy,m3000-v1|\
cudy,tr3000-v1|\
glinet,gl-mt2500|\
@@ -69,12 +82,6 @@ mediatek_setup_interfaces()
dlink,aquila-pro-ai-m30-a1)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" internet
;;
- glinet,gl-mt6000|\
- tplink,tl-xdr4288|\
- tplink,tl-xdr6088|\
- tplink,tl-xtr8488)
- ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
- ;;
mediatek,mt7986a-rfb)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan6" "eth1 wan"
;;
@@ -87,13 +94,6 @@ mediatek_setup_interfaces()
mercusys,mr90x-v1)
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2" eth1
;;
- cudy,ap3000outdoor-v1|\
- cudy,re3000-v1|\
- netgear,wax220|\
- ubnt,unifi-6-plus|\
- zyxel,nwa50ax-pro)
- ucidef_set_interface_lan "eth0"
- ;;
smartrg,sdg-8622|\
smartrg,sdg-8632|\
smartrg,sdg-8733a|\
@@ -115,10 +115,6 @@ mediatek_setup_interfaces()
xiaomi,redmi-router-ax6000-ubootmod)
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan
;;
- zyxel,ex5601-t0-stock|\
- zyxel,ex5601-t0-ubootmod)
- ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1
- ;;
*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
;;
diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index 429728392a..edc0456566 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -131,13 +131,6 @@ platform_do_upgrade() {
EMMC_ROOT_DEV="$(cmdline_get_var root)"
emmc_do_upgrade "$1"
;;
- xiaomi,mi-router-ax3000t|\
- xiaomi,mi-router-wr30u-stock|\
- xiaomi,redmi-router-ax6000-stock)
- CI_KERN_UBIPART=ubi_kernel
- CI_ROOT_UBIPART=ubi
- nand_do_upgrade "$1"
- ;;
unielec,u7981-01*)
local rootdev="$(cmdline_get_var root)"
rootdev="${rootdev##*/}"
@@ -155,6 +148,13 @@ platform_do_upgrade() {
;;
esac
;;
+ xiaomi,mi-router-ax3000t|\
+ xiaomi,mi-router-wr30u-stock|\
+ xiaomi,redmi-router-ax6000-stock)
+ CI_KERN_UBIPART=ubi_kernel
+ CI_ROOT_UBIPART=ubi
+ nand_do_upgrade "$1"
+ ;;
*)
nand_do_upgrade "$1"
;;
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index 3e10003e4c..83f1336444 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -83,6 +83,10 @@ define Build/append-gl-metadata
}
endef
+define Build/append-openwrt-one-eeprom
+ dd if=$(STAGING_DIR_IMAGE)/mt7981_eeprom_mt7976_dbdc.bin >> $@
+endef
+
define Build/zyxel-nwa-fit-filogic
$(TOPDIR)/scripts/mkits-zyxel-fit-filogic.sh \
$@.its $@ "80 e1 ff ff ff ff ff ff ff ff"
@@ -1047,10 +1051,6 @@ define Device/openembed_som7981
endef
TARGET_DEVICES += openembed_som7981
-define Build/append-openwrt-one-eeprom
- dd if=$(STAGING_DIR_IMAGE)/mt7981_eeprom_mt7976_dbdc.bin >> $@
-endef
-
define Device/openwrt_one
DEVICE_VENDOR := OpenWrt
DEVICE_MODEL := One
@@ -1404,7 +1404,6 @@ define Device/yuncore_ax835
endef
TARGET_DEVICES += yuncore_ax835
-
define Device/zbtlink_zbt-z8102ax
DEVICE_VENDOR := Zbtlink
DEVICE_MODEL := ZBT-Z8102AX
More information about the lede-commits
mailing list