mediatek: filogic: reorder alphabetically

Reorder scripts and image recipes to keep alphabetical order.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
(cherry picked from commit 07482d15af5dd79fc38dd0eb23319934fe4d7a7a)

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 522e288ef54e57026c0e6568987e34e91a8ef2d4..857cc4b77ee310446154496c37adf4cb90fd321e 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -19,24 +19,27 @@ mediatek_setup_interfaces()
        asus,tuf-ax6000)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
                ;;
-       netgear,wax220|\
-       ubnt,unifi-6-plus|\
-       zyxel,nwa50ax-pro)
-               ucidef_set_interface_lan "eth0"
-               ;;
        bananapi,bpi-r3)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
                ;;
-       cudy,wr3000-v1)
-               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
-               ;;
-       glinet,gl-mt3000)
-               ucidef_set_interfaces_lan_wan eth1 eth0
+       cetron,ct3003|\
+       cudy,wr3000-v1|\
+       jcg,q30-pro|\
+       qihoo,360t7)
+               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
                ;;
        cmcc,rax3000m|\
        h3c,magic-nx30-pro)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1
                ;;
+       glinet,gl-mt3000)
+               ucidef_set_interfaces_lan_wan eth1 eth0
+               ;;
+       glinet,gl-mt6000|\
+       tplink,tl-xdr4288|\
+       tplink,tl-xdr6088)
+               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"
                ;;
@@ -49,15 +52,10 @@ mediatek_setup_interfaces()
        mercusys,mr90x-v1)
                ucidef_set_interfaces_lan_wan "lan0 lan1 lan2" eth1
                ;;
-       cetron,ct3003|\
-       jcg,q30-pro|\
-       qihoo,360t7)
-               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
-               ;;
-       glinet,gl-mt6000|\
-       tplink,tl-xdr4288|\
-       tplink,tl-xdr6088)
-               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
+       netgear,wax220|\
+       ubnt,unifi-6-plus|\
+       zyxel,nwa50ax-pro)
+               ucidef_set_interface_lan "eth0"
                ;;
        tplink,tl-xdr6086)
                ucidef_set_interfaces_lan_wan "lan1 lan2" eth1

diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
index b33d43c8c0dd4705edc9878c7f633b401ea96555..b2b4f377a645af005c194c8c3e61f3a0b8cc8549 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
@@ -80,11 +80,6 @@ case "$board" in
                [ "$PHYNBR" = "0" ] && macaddr_add $hw_mac_addr 2 > /sys${DEVPATH}/macaddress
                [ "$PHYNBR" = "1" ] && macaddr_add $hw_mac_addr 3 > /sys${DEVPATH}/macaddress
                ;;
-       ubnt,unifi-6-plus)
-               addr=$(mtd_get_mac_binary EEPROM 0x6)
-               [ "$PHYNBR" = "0" ] && echo "$addr" > /sys${DEVPATH}/macaddress
-               [ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
-               ;;
        qihoo,360t7)
                addr=$(mtd_get_mac_ascii factory lanMac)
                [ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
@@ -95,6 +90,11 @@ case "$board" in
        tplink,tl-xdr6088)
                [ "$PHYNBR" = "0" ] && get_mac_label > /sys${DEVPATH}/macaddress
                ;;
+       ubnt,unifi-6-plus)
+               addr=$(mtd_get_mac_binary EEPROM 0x6)
+               [ "$PHYNBR" = "0" ] && echo "$addr" > /sys${DEVPATH}/macaddress
+               [ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
+               ;;
        zbtlink,zbt-z8102ax|\
        zyxel,ex5601-t0)
                addr=$(mtd_get_mac_binary "Factory" 0x4)

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 bfe5ed830bdf0e11dde6ce9109e69bb75120fc15..e2683c8d554c707c78547e8cfb08a5c23cbc0a9b 100755 (executable)
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -102,15 +102,6 @@ platform_do_upgrade() {
                CI_ROOTPART="rootfs"
                emmc_do_upgrade "$1"
                ;;
-       mercusys,mr90x-v1)
-               CI_UBIPART="ubi0"
-               nand_do_upgrade "$1"
-               ;;
-       ubnt,unifi-6-plus)
-               CI_KERNPART="kernel0"
-               EMMC_ROOT_DEV="$(cmdline_get_var root)"
-               emmc_do_upgrade "$1"
-               ;;
        h3c,magic-nx30-pro|\
        jcg,q30-pro|\
        mediatek,mt7981-rfb|\
@@ -124,6 +115,15 @@ platform_do_upgrade() {
                CI_KERNPART="fit"
                nand_do_upgrade "$1"
                ;;
+       mercusys,mr90x-v1)
+               CI_UBIPART="ubi0"
+               nand_do_upgrade "$1"
+               ;;
+       ubnt,unifi-6-plus)
+               CI_KERNPART="kernel0"
+               EMMC_ROOT_DEV="$(cmdline_get_var root)"
+               emmc_do_upgrade "$1"
+               ;;
        xiaomi,mi-router-wr30u-stock|\
        xiaomi,redmi-router-ax6000-stock)
                CI_KERN_UBIPART=ubi_kernel

diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index 300a7da9fb2aa7309db461f6bc15545abeffc849..01e4f94f667d9dbfeceee5d3c618645757424b13 100644 (file)
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -105,6 +105,21 @@ define Build/cetron-header
        rm $@.tmp
 endef
 
+define Device/acer_predator-w6
+  DEVICE_VENDOR := Acer
+  DEVICE_MODEL := Predator W6
+  DEVICE_DTS := mt7986a-acer-predator-w6
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_LOADADDR := 0x47000000
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt7986-firmware kmod-mt7916-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs
+  IMAGES := sysupgrade.bin
+  KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+  KERNEL_INITRAMFS := kernel-bin | lzma | \
+       fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += acer_predator-w6
+
 define Device/asus_tuf-ax4200
   DEVICE_VENDOR := ASUS
   DEVICE_MODEL := TUF-AX4200
@@ -137,21 +152,6 @@ define Device/asus_tuf-ax6000
 endef
 TARGET_DEVICES += asus_tuf-ax6000
 
-define Device/acer_predator-w6
-  DEVICE_VENDOR := Acer
-  DEVICE_MODEL := Predator W6
-  DEVICE_DTS := mt7986a-acer-predator-w6
-  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS_LOADADDR := 0x47000000
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt7986-firmware kmod-mt7916-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs
-  IMAGES := sysupgrade.bin
-  KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
-  KERNEL_INITRAMFS := kernel-bin | lzma | \
-       fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += acer_predator-w6
-
 define Device/bananapi_bpi-r3
   DEVICE_VENDOR := Bananapi
   DEVICE_MODEL := BPi-R3
@@ -354,24 +354,6 @@ define Device/jcg_q30-pro
 endef
 TARGET_DEVICES += jcg_q30-pro
 
-define Device/netgear_wax220
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WAX220
-  DEVICE_DTS := mt7986b-netgear-wax220
-  DEVICE_DTS_DIR := ../dts
-  NETGEAR_ENC_MODEL := WAX220
-  NETGEAR_ENC_REGION := US
-  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware
-  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
-  IMAGE_SIZE := 32768k
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  IMAGES += factory.img
-  # Padding to 10M seems to be required by OEM web interface
-  IMAGE/factory.img := sysupgrade-tar | \
-         pad-to 10M | check-size | netgear-encrypted-factory
-endef
-TARGET_DEVICES += netgear_wax220
-
 define Device/mediatek_mt7981-rfb
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7981 rfb
@@ -543,6 +525,24 @@ define Device/mercusys_mr90x-v1
 endef
 TARGET_DEVICES += mercusys_mr90x-v1
 
+define Device/netgear_wax220
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WAX220
+  DEVICE_DTS := mt7986b-netgear-wax220
+  DEVICE_DTS_DIR := ../dts
+  NETGEAR_ENC_MODEL := WAX220
+  NETGEAR_ENC_REGION := US
+  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware
+  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
+  IMAGE_SIZE := 32768k
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGES += factory.img
+  # Padding to 10M seems to be required by OEM web interface
+  IMAGE/factory.img := sysupgrade-tar | \
+         pad-to 10M | check-size | netgear-encrypted-factory
+endef
+TARGET_DEVICES += netgear_wax220
+
 define Device/qihoo_360t7
   DEVICE_VENDOR := Qihoo
   DEVICE_MODEL := 360T7