[openwrt/openwrt] ipq806x: fix sorting in base-files

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3156d72cbf43cc240d21ba88401154b85d05d46d

commit 3156d72cbf43cc240d21ba88401154b85d05d46d
Author: Christoph Krapp <achterin at gmail.com>
AuthorDate: Thu Oct 30 19:42:55 2025 +0100

    ipq806x: fix sorting in base-files
    
    Align the sorting of cases with other targets.
    
    Signed-off-by: Christoph Krapp <achterin at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/20603
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 .../ipq806x/base-files/etc/board.d/02_network      | 46 +++++++++++-----------
 .../base-files/etc/board.d/05_compat-version       |  6 +--
 .../ipq806x/base-files/lib/upgrade/platform.sh     | 18 ++++-----
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index 42bea95e97..e09a12af87 100644
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -16,23 +16,23 @@ ipq806x_setup_interfaces()
 		;;
 	askey,rt4230w-rev6|\
 	asrock,g10|\
-	nec,wg2600hp|\
 	buffalo,wxr-2533dhp|\
 	compex,wpq864|\
-	netgear,d7800|\
-	netgear,r7500|\
-	netgear,r7500v2|\
-	qcom,ipq8064-ap148|\
 	linksys,e8350-v1|\
 	linksys,ea7500-v1|\
 	linksys,ea8500|\
+	nec,wg2600hp|\
 	nec,wg2600hp3|\
+	netgear,d7800|\
+	netgear,r7500|\
+	netgear,r7500v2|\
 	netgear,r7800|\
-	netgear,xr500|\
 	netgear,xr450|\
+	netgear,xr500|\
+	qcom,ipq8064-ap148|\
+	tplink,ad7200|\
 	tplink,c2600|\
 	tplink,vr2600v|\
-	tplink,ad7200|\
 	zyxel,nbg6817)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		ucidef_set_network_device_conduit "lan1" "eth1"
@@ -51,12 +51,6 @@ ipq806x_setup_interfaces()
 	extreme,ap3935)
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
-	qcom,ipq8064-ap161)
-		ucidef_set_interface_lan "eth1 eth2 lan1 lan2 lan3 lan4" "wan"
-		;;
-	qcom,ipq8064-db149)
-		ucidef_set_interface_lan "eth1 eth2 eth3 lan1 lan2 lan3 lan4" "wan"
-		;;
 	fortinet,fap-421e|\
 	ignitenet,ss-w2-ac2600|\
 	ubnt,unifi-ac-hd)
@@ -68,6 +62,12 @@ ipq806x_setup_interfaces()
 	meraki,mr52)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		;;
+	qcom,ipq8064-ap161)
+		ucidef_set_interface_lan "eth1 eth2 lan1 lan2 lan3 lan4" "wan"
+		;;
+	qcom,ipq8064-db149)
+		ucidef_set_interface_lan "eth1 eth2 eth3 lan1 lan2 lan3 lan4" "wan"
+		;;
 	*)
 		echo "Unsupported hardware. Network interfaces not intialized"
 		;;
@@ -79,17 +79,17 @@ ipq806x_setup_macs()
 	local board="$1"
 
 	case "$board" in
-		linksys,e8350-v1|\
-		zyxel,nbg6817)
-			hw_mac_addr=$(mtd_get_mac_ascii 0:appsblenv ethaddr)
-			ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"
-			ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 3)"
+	asrock,g10)
+		hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
+		ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
+		hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
+		ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 1)"
 		;;
-		asrock,g10)
-			hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
-			ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
-			hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
-			ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 1)"
+	linksys,e8350-v1|\
+	zyxel,nbg6817)
+		hw_mac_addr=$(mtd_get_mac_ascii 0:appsblenv ethaddr)
+		ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"
+		ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 3)"
 		;;
 	esac
 }
diff --git a/target/linux/ipq806x/base-files/etc/board.d/05_compat-version b/target/linux/ipq806x/base-files/etc/board.d/05_compat-version
index 1bcbddb774..de35a72daf 100644
--- a/target/linux/ipq806x/base-files/etc/board.d/05_compat-version
+++ b/target/linux/ipq806x/base-files/etc/board.d/05_compat-version
@@ -12,6 +12,7 @@ case "$(board_name)" in
 	arris,tr4400-v2|\
 	askey,rt4230w-rev6|\
 	asrock,g10|\
+	asus,onhub|\
 	buffalo,wxr-2533dhp|\
 	compex,wpq864|\
 	fortinet,fap-421e|\
@@ -29,10 +30,9 @@ case "$(board_name)" in
 	qcom,ipq8064-db149|\
 	tplink,ad7200|\
 	tplink,c2600|\
+	tplink,onhub|\
 	tplink,vr2600v|\
-	zyxel,nbg6817|\
-	asus,onhub|\
-	tplink,onhub)
+	zyxel,nbg6817)
 		ucidef_set_compat_version "1.1"
 		;;
 	linksys,ea7500-v1|\
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index 43df4b6817..972aa41a85 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -30,6 +30,15 @@ platform_do_upgrade() {
 		asrock_upgrade_prepare
 		nand_do_upgrade "$1"
 		;;
+	asus,onhub|\
+	tplink,onhub)
+		export_bootdevice
+		export_partdevice CI_ROOTDEV 0
+		CI_KERNPART="kernel"
+		CI_ROOTPART="rootfs"
+		CI_DATAPART="rootfs_data"
+		emmc_do_upgrade "$1"
+		;;
 	buffalo,wxr-2533dhp)
 		buffalo_upgrade_prepare_ubi
 		CI_ROOTPART="ubi_rootfs"
@@ -67,15 +76,6 @@ platform_do_upgrade() {
 		MTD_CONFIG_ARGS="-s 0x200000"
 		default_do_upgrade "$1"
 		;;
-	asus,onhub|\
-	tplink,onhub)
-		export_bootdevice
-		export_partdevice CI_ROOTDEV 0
-		CI_KERNPART="kernel"
-		CI_ROOTPART="rootfs"
-		CI_DATAPART="rootfs_data"
-		emmc_do_upgrade "$1"
-		;;
 	tplink,vr2600v)
 		MTD_CONFIG_ARGS="-s 0x200000"
 		default_do_upgrade "$1"