ipq806x: ecw5410: case-insensitive qcom-smem partitions

The out-of-tree qcom-smem patches traditionally displayed mtd partition names
in upper case, starting with the new mainline qcom-smem support in kernel v5.10,
it switches to normalizing the partition names to lower case.

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>

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 511794a3ceaa54fcba414faf8d0ca81377e4fd1f..abdab898570171e8c8d4960644845299dc97447a 100644 (file)
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -28,8 +28,14 @@ tplink,vr2600v)
        ;;
 edgecore,ecw5410)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
-       ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:ART" 0x6)"
-       ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:ART" 0x0)"
+       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
        ;;
 linksys,ea7500-v1)
        hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)

diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 3dd7a51d5d0b63166410c5baae675d57e15102ef..fca35516ec6418b2dd101fa8c0e457321d2a0ce6 100644 (file)
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -22,7 +22,12 @@ case "$FIRMWARE" in
                ath10k_patch_mac $(mtd_get_mac_binary ART 0x1e)
                ;;
        edgecore,ecw5410)
-               caldata_extract "0:ART" 0x1000 0x2f20
+               if [ -b "$(find_mtd_part 0:art)" ]; then
+                       caldata_extract "0:art" 0x1000 0x2f20
+               else
+                       # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
+                       caldata_extract "0:ART" 0x1000 0x2f20
+               fi
                ;;
        linksys,ea7500-v1 |\
        linksys,ea8500)
@@ -115,7 +120,12 @@ case "$FIRMWARE" in
 "ath10k/pre-cal-pci-0002:01:00.0.bin")
        case $board in
        edgecore,ecw5410)
-               caldata_extract "0:ART" 0x5000 0x2f20
+               if [ -b "$(find_mtd_part 0:art)" ]; then
+                       caldata_extract "0:art" 0x5000 0x2f20
+               else
+                       # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
+                       caldata_extract "0:ART" 0x5000 0x2f20
+               fi
                ;;
        esac
        ;;