ipq40xx: fix sorting in base-files

Align the sorting of cases with other targets.

Signed-off-by: Christoph Krapp <achterin@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20518
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index a9e576e9730a4df522a6b8d02bcb13cbc9545bd7..eee259b8727d27b0a5bdf5ce890b08f97f094aca 100644 (file)
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -59,6 +59,29 @@ glinet,gl-b1300|\
 mikrotik,lhgg-60ad)
        ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt"
        ;;
+meraki,gx20|\
+meraki,z3)
+       ucidef_set_led_netdev "wan_link" "WAN (link)" "green:wan-0" "wan" "link"
+       ucidef_set_led_netdev "wan_act" "WAN (txrx)" "green:wan-1" "wan" "tx rx"
+       ucidef_set_led_netdev "lan1_link" "LAN2 (link)" "green:lan-2" "lan2" "link"
+       ucidef_set_led_netdev "lan1_act" "LAN2 (txrx)" "green:lan-3" "lan2" "tx rx"
+       ucidef_set_led_netdev "lan2_link" "LAN3 (link)" "green:lan-4" "lan3" "link"
+       ucidef_set_led_netdev "lan2_act" "LAN3 (txrx)" "green:lan-5" "lan3" "tx rx"
+       ucidef_set_led_netdev "lan3_link" "LAN4 (link)" "green:lan-6" "lan4" "link"
+       ucidef_set_led_netdev "lan3_act" "LAN4 (txrx)" "green:lan-7" "lan4" "tx rx"
+       ucidef_set_led_netdev "lan4_link" "LAN5 (link)" "green:lan-8" "lan5" "link"
+       ucidef_set_led_netdev "lan4_act" "LAN5 (txrx)" "green:lan-9" "lan5" "tx rx"
+       ;;
+meraki,mr30h)
+       ucidef_set_led_netdev "lan1_link" "LAN1 (link)" "green:lan-0" "lan1" "link"
+       ucidef_set_led_netdev "lan1_act" "LAN1 (txrx)" "amber:lan-1" "lan1" "tx rx"
+       ucidef_set_led_netdev "lan2_link" "LAN2 (link)" "green:lan-2" "lan2" "link"
+       ucidef_set_led_netdev "lan2_act" "LAN2 (txrx)" "amber:lan-3" "lan2" "tx rx"
+       ucidef_set_led_netdev "lan3_link" "LAN3 (link)" "green:lan-4" "lan3" "link"
+       ucidef_set_led_netdev "lan3_act" "LAN3 (txrx)" "amber:lan-5" "lan3" "tx rx"
+       ucidef_set_led_netdev "lan4_link" "LAN4 (link)" "green:lan-6" "lan4" "link"
+       ucidef_set_led_netdev "lan4_act" "LAN4 (txrx)" "amber:lan-7" "lan4" "tx rx"
+       ;;
 mikrotik,cap-ac)
        ucidef_set_led_default "power" "POWER" "blue:power" "1"
        ucidef_set_led_default "user" "USER" "green:user" "0"
@@ -82,7 +105,6 @@ mikrotik,hap-ac3-lte6-kit)
        ucidef_set_led_netdev "lan3" "LAN3" "green:lan3" "lan3"
        ucidef_set_led_netdev "lan4" "LAN4" "green:lan4" "lan4"
        ;;
-
 mikrotik,sxtsq-5-ac)
        ucidef_set_rssimon "wlan0" "200000" "1"
        ucidef_set_led_rssi "rssilow" "rssilow" "green:rssilow" "wlan0" "1" "100"
@@ -96,29 +118,6 @@ mobipromo,cm520-79f)
        ucidef_set_led_netdev "lan1" "LAN1" "blue:lan1" "lan1"
        ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "lan2"
        ;;
-meraki,gx20|\
-meraki,z3)
-       ucidef_set_led_netdev "wan_link" "WAN (link)" "green:wan-0" "wan" "link"
-       ucidef_set_led_netdev "wan_act" "WAN (txrx)" "green:wan-1" "wan" "tx rx"
-       ucidef_set_led_netdev "lan1_link" "LAN2 (link)" "green:lan-2" "lan2" "link"
-       ucidef_set_led_netdev "lan1_act" "LAN2 (txrx)" "green:lan-3" "lan2" "tx rx"
-       ucidef_set_led_netdev "lan2_link" "LAN3 (link)" "green:lan-4" "lan3" "link"
-       ucidef_set_led_netdev "lan2_act" "LAN3 (txrx)" "green:lan-5" "lan3" "tx rx"
-       ucidef_set_led_netdev "lan3_link" "LAN4 (link)" "green:lan-6" "lan4" "link"
-       ucidef_set_led_netdev "lan3_act" "LAN4 (txrx)" "green:lan-7" "lan4" "tx rx"
-       ucidef_set_led_netdev "lan4_link" "LAN5 (link)" "green:lan-8" "lan5" "link"
-       ucidef_set_led_netdev "lan4_act" "LAN5 (txrx)" "green:lan-9" "lan5" "tx rx"
-       ;;
-meraki,mr30h)
-       ucidef_set_led_netdev "lan1_link" "LAN1 (link)" "green:lan-0" "lan1" "link"
-       ucidef_set_led_netdev "lan1_act" "LAN1 (txrx)" "amber:lan-1" "lan1" "tx rx"
-       ucidef_set_led_netdev "lan2_link" "LAN2 (link)" "green:lan-2" "lan2" "link"
-       ucidef_set_led_netdev "lan2_act" "LAN2 (txrx)" "amber:lan-3" "lan2" "tx rx"
-       ucidef_set_led_netdev "lan3_link" "LAN3 (link)" "green:lan-4" "lan3" "link"
-       ucidef_set_led_netdev "lan3_act" "LAN3 (txrx)" "amber:lan-5" "lan3" "tx rx"
-       ucidef_set_led_netdev "lan4_link" "LAN4 (link)" "green:lan-6" "lan4" "link"
-       ucidef_set_led_netdev "lan4_act" "LAN4 (txrx)" "amber:lan-7" "lan4" "tx rx"
-       ;;
 netgear,ex6100v2|\
 netgear,ex6150v2)
        ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt"

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index ad1e334e2f330777b2ffdaf87f21ada0b69ddd14..ba953216f50976e83cc98ccafb8cdc60ab64c133 100644 (file)
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -29,10 +29,6 @@ ipq40xx_setup_interfaces()
        zyxel,nbg6617)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
                ;;
-       meraki,gx20|\
-       meraki,z3)
-               ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
-               ;;
        8dev,jalapeno|\
        alfa-network,ap120c-ac|\
        asus,map-ac2200|\
@@ -67,6 +63,17 @@ ipq40xx_setup_interfaces()
        zte,mf282plus)
                ucidef_set_interface_lan "lan"
                ;;
+       aruba,ap-303h|\
+       buffalo,wtr-m2133hp|\
+       ezviz,cs-w3-wd1200g-eup|\
+       netgear,rbr40|\
+       netgear,rbs40|\
+       netgear,rbr50|\
+       netgear,rbs50|\
+       netgear,srr60|\
+       netgear,srs60)
+               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
+               ;;
        avm,fritzbox-7530)
                ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
                ;;
@@ -90,21 +97,21 @@ ipq40xx_setup_interfaces()
        mobipromo,cm520-79f)
                ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
                ;;
+       meraki,gx20|\
+       meraki,z3)
+               ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
+               ;;
+       meraki,mr30h)
+               ucidef_set_interface_lan "lan1 lan2 lan3 lan4 lan5"
+               ;;
        mikrotik,wap-ac|\
        mikrotik,wap-ac-lte|\
        mikrotik,wap-r-ac)
                ucidef_set_interface_lan "sw-eth1 sw-eth2"
                ;;
-       aruba,ap-303h|\
-       buffalo,wtr-m2133hp|\
-       ezviz,cs-w3-wd1200g-eup|\
-       netgear,rbr40|\
-       netgear,rbs40|\
-       netgear,rbr50|\
-       netgear,rbs50|\
-       netgear,srr60|\
-       netgear,srs60)
-               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
+       netgear,lbr20)
+               ucidef_set_interface_lan "lan1 lan2"
+               ucidef_set_interface "wan" device "/dev/cdc-wdm0" protocol "qmi"
                ;;
        openmesh,a42|\
        openmesh,a62)
@@ -132,13 +139,6 @@ ipq40xx_setup_interfaces()
                ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
                ucidef_set_interface "wan" device "/dev/cdc-wdm0" protocol "qmi"
                ;;
-       netgear,lbr20)
-               ucidef_set_interface_lan "lan1 lan2"
-               ucidef_set_interface "wan" device "/dev/cdc-wdm0" protocol "qmi"
-               ;;
-       meraki,mr30h)
-               ucidef_set_interface_lan "lan1 lan2 lan3 lan4 lan5"
-               ;;
        *)
                echo "Unsupported hardware. Network interfaces not initialized"
                ;;

diff --git a/target/linux/ipq40xx/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/ipq40xx/base-files/etc/uci-defaults/05_fix-compat-version
index c011920897120cc8124ae74432959ede788f8c11..9ee8adbf7f54e49aa344e1225464072a0367d37c 100644 (file)
--- a/target/linux/ipq40xx/base-files/etc/uci-defaults/05_fix-compat-version
+++ b/target/linux/ipq40xx/base-files/etc/uci-defaults/05_fix-compat-version
@@ -1,10 +1,10 @@
 . /lib/functions.sh
 
 case "$(board_name)" in
+ezviz,cs-w3-wd1200g-eup|\
 linksys,ea6350v3|\
 linksys,ea8300|\
-linksys,mr8300|\
-ezviz,cs-w3-wd1200g-eup)
+linksys,mr8300)
        uci set system.@system[0].compat_version="2.0"
        uci commit system
        ;;

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index daf29192ab8cf345516b0f268fb78e2072e2410b..3f68c0a60e43a6f827db0db087d77c4faee05c96 100644 (file)
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -129,12 +129,6 @@ platform_do_upgrade() {
        wallys,dr40x9)
                nand_do_upgrade "$1"
                ;;
-       glinet,gl-b2200)
-               CI_KERNPART="0:HLOS"
-               CI_ROOTPART="rootfs"
-               CI_DATAPART="rootfs_data"
-               emmc_do_upgrade "$1"
-               ;;
        alfa-network,ap120c-ac)
                part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')"
                if [ "$part" = "rootfs1" ]; then
@@ -156,6 +150,12 @@ platform_do_upgrade() {
                CI_UBIPART="ubifs"
                askey_do_upgrade "$1"
                ;;
+       glinet,gl-b2200)
+               CI_KERNPART="0:HLOS"
+               CI_ROOTPART="rootfs"
+               CI_DATAPART="rootfs_data"
+               emmc_do_upgrade "$1"
+               ;;
        google,wifi)
                export_bootdevice
                export_partdevice CI_ROOTDEV 0
@@ -173,12 +173,6 @@ platform_do_upgrade() {
        linksys,whw03)
                platform_do_upgrade_linksys_emmc "$1"
                ;;
-       meraki,mr30h|\
-       meraki,mr33|\
-       meraki,mr74)
-               CI_KERNPART="part.safe"
-               nand_do_upgrade "$1"
-               ;;
        meraki,gx20|\
        meraki,z3)
                # DO NOT set CI_KERNPART to part.safe,
@@ -187,6 +181,12 @@ platform_do_upgrade() {
                CI_KERNPART="part.old"
                nand_do_upgrade "$1"
                ;;
+       meraki,mr30h|\
+       meraki,mr33|\
+       meraki,mr74)
+               CI_KERNPART="part.safe"
+               nand_do_upgrade "$1"
+               ;;
        mikrotik,cap-ac|\
        mikrotik,hap-ac2|\
        mikrotik,hap-ac3-lte6-kit|\