[openwrt/openwrt] ipq40xx: merge duplicated cases in base-files

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/26d2485f54d58f4fb9271784b57577afa33c75e2

commit 26d2485f54d58f4fb9271784b57577afa33c75e2
Author: Christoph Krapp <achterin at gmail.com>
AuthorDate: Thu Oct 23 19:07:20 2025 +0200

    ipq40xx: merge duplicated cases in base-files
    
    Merge some identical cases in base-files.
    
    Signed-off-by: Christoph Krapp <achterin at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/20518
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/ipq40xx/base-files/etc/board.d/02_network  | 10 +++-------
 target/linux/ipq40xx/base-files/lib/upgrade/platform.sh |  9 ++-------
 2 files changed, 5 insertions(+), 14 deletions(-)

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 f86ca45611..ad1e334e2f 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -71,9 +71,7 @@ ipq40xx_setup_interfaces()
 		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
 		;;
 	avm,fritzrepeater-3000|\
-	cellc,rtl30vw)
-		ucidef_set_interface_lan "lan1 lan2"
-		;;
+	cellc,rtl30vw|\
 	compex,wpj428)
 		ucidef_set_interface_lan "lan1 lan2"
 		;;
@@ -175,7 +173,8 @@ ipq40xx_setup_macs()
 	local label_mac=""
 
 	case "$board" in
-	8dev,habanero-dvk)
+	8dev,habanero-dvk|\
+	cilab,meshpoint-one)
 		label_mac=$(mtd_get_mac_binary "ART" 0x1006)
 		;;
 	asus,rt-ac42u)
@@ -185,9 +184,6 @@ ipq40xx_setup_macs()
 		local tffsdev=$(find_mtd_chardev "nand-tffs")
 		wan_mac=$(/usr/bin/fritz_tffs_nand -b -d $tffsdev -n macdsl)
 		;;
-	cilab,meshpoint-one)
-		label_mac=$(mtd_get_mac_binary "ART" 0x1006)
-		;;
 	devolo,magic-2-wifi-next)
 		lan_mac=$(mtd_get_mac_ascii APPSBLENV MacAddress0)
 		label_mac=$lan_mac
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 6235cf85db..daf29192ab 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -113,6 +113,7 @@ platform_do_upgrade() {
 	avm,fritzrepeater-3000|\
 	buffalo,wtr-m2133hp|\
 	cilab,meshpoint-one|\
+	compex,wpj419|\
 	edgecore,ecw5211|\
 	edgecore,oap100|\
 	engenius,eap2200|\
@@ -145,10 +146,7 @@ platform_do_upgrade() {
 		fi
 		nand_do_upgrade "$1"
 		;;
-	asus,map-ac2200)
-		CI_KERNPART="linux"
-		nand_do_upgrade "$1"
-		;;
+	asus,map-ac2200|\
 	asus,rt-ac42u|\
 	asus,rt-ac58u)
 		CI_KERNPART="linux"
@@ -158,9 +156,6 @@ platform_do_upgrade() {
 		CI_UBIPART="ubifs"
 		askey_do_upgrade "$1"
 		;;
-	compex,wpj419)
-		nand_do_upgrade "$1"
-		;;
 	google,wifi)
 		export_bootdevice
 		export_partdevice CI_ROOTDEV 0