ipq806x: remove transition workarounds for qcom-smem partitions

[openwrt/openwrt.git] / target / linux / ipq806x / base-files / etc / board.d / 02_network

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 bb77332ef929c03e28d9a006ff0667df593a4dbb..a75d32ab6f51e9e25a516b976036e6b1a264084a 100644 (file)
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -29,14 +29,8 @@ tplink,vr2600v)
        ;;
 edgecore,ecw5410)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
-       if [ -b "$(find_mtd_part 0:art)" ]; then
-               ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:art" 0x6)"
-               ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:art" 0x0)"
-       else
-               # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-               ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:ART" 0x6)"
-               ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:ART" 0x0)"
-       fi
+       ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:art" 0x6)"
+       ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:art" 0x0)"
        ;;
 linksys,ea7500-v1)
        hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
@@ -81,9 +75,6 @@ ubnt,unifi-ac-hd)
        ;;
 zyxel,nbg6817)
        hw_mac_addr=$(mtd_get_mac_ascii 0:appsblenv ethaddr)
-       # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-       [ -n "$hw_mac_addr" ] || \
-               hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
        ucidef_add_switch "switch0" \
                "1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
        ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"