aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Lippers-Hollmann <s.l-h@gmx.de>2021-05-07 01:09:50 +0200
committerPetr Štetiar <ynezz@true.cz>2021-05-08 18:45:42 +0200
commit435dc2e77e3b6a92b3be1e386bf99d4d458d2bb9 (patch)
tree077da88888f9097e100bf8080ce45ceaa5b304ff
parentf70e11cd974effdea1ed2ae0ded3033984ba3dad (diff)
downloadupstream-435dc2e77e3b6a92b3be1e386bf99d4d458d2bb9.tar.gz
upstream-435dc2e77e3b6a92b3be1e386bf99d4d458d2bb9.tar.bz2
upstream-435dc2e77e3b6a92b3be1e386bf99d4d458d2bb9.zip
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>
-rw-r--r--target/linux/ipq806x/base-files/etc/board.d/02_network10
-rw-r--r--target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata14
2 files changed, 20 insertions, 4 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 511794a3ce..abdab89857 100644
--- 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 3dd7a51d5d..fca35516ec 100644
--- 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
;;