ipq40xx: merge duplicated cases in base-files

Merge some identical cases in base-files.

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/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index f86ca4561184437d81427e01cd913574e4c3c701..ad1e334e2f330777b2ffdaf87f21ada0b69ddd14 100644 (file)
--- 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 6235cf85db27392e01634df8d46d3a036ee5a7e4..daf29192ab8cf345516b0f268fb78e2072e2410b 100644 (file)
--- 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