[openwrt/openwrt] ipq806x: remove transition workarounds for qcom-smem partitions
LEDE Commits
lede-commits at lists.infradead.org
Sat Oct 30 13:12:24 PDT 2021
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6a27e8036e63f2477333c324ae41f038e9ac6297
commit 6a27e8036e63f2477333c324ae41f038e9ac6297
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Sat Oct 30 20:06:58 2021 +0200
ipq806x: remove transition workarounds for 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 switched to normalizing the partition names to lower case.
While both 5.4 and 5.10 were supported in the target, we carried a workaround
to support both of them. Since the target has dropped 5.4 recently, those
can be removed now.
Ref:
2db9dded0a1a ("ipq806x: nbg6817: case-insensitive qcom-smem partitions")
435dc2e77e3b ("ipq806x: ecw5410: case-insensitive qcom-smem partitions")
f70e11cd974e ("ipq806x: g10: case-insensitive qcom-smem partitions")
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
.../ipq806x/base-files/etc/board.d/02_network | 13 +-----
.../etc/hotplug.d/firmware/11-ath10k-caldata | 48 ++++------------------
.../linux/ipq806x/base-files/lib/upgrade/asrock.sh | 2 -
.../linux/ipq806x/base-files/lib/upgrade/zyxel.sh | 3 --
4 files changed, 10 insertions(+), 56 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 bb77332ef9..a75d32ab6f 100644
--- 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 at eth1" "5:wan" "0 at eth0"
ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"
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 2746ef1e2a..c8924df92f 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
@@ -13,23 +13,13 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x1000 0x2f20
;;
asrock,g10)
- 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
+ caldata_extract "0:art" 0x1000 0x2f20
;;
buffalo,wxr-2533dhp)
caldata_extract "ART" 0x1000 0x2f20
;;
edgecore,ecw5410)
- 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
+ caldata_extract "0:art" 0x1000 0x2f20
;;
linksys,ea7500-v1 |\
linksys,ea8500)
@@ -56,14 +46,8 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x1000 0x2f20
;;
zyxel,nbg6817)
- if [ -b "$(find_mtd_part 0:art)" ]; then
- caldata_extract "0:art" 0x1000 0x2f20
- ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
- else
- # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
- caldata_extract "0:ART" 0x1000 0x2f20
- ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 1)
- fi
+ caldata_extract "0:art" 0x1000 0x2f20
+ ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
;;
esac
;;
@@ -73,12 +57,7 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x5000 0x2f20
;;
asrock,g10)
- 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
+ caldata_extract "0:art" 0x5000 0x2f20
;;
buffalo,wxr-2533dhp)
caldata_extract "ART" 0x5000 0x2f20
@@ -108,26 +87,15 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
;;
zyxel,nbg6817)
- if [ -b "$(find_mtd_part 0:art)" ]; then
- caldata_extract "0:art" 0x5000 0x2f20
- ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
- else
- # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
- caldata_extract "0:ART" 0x5000 0x2f20
- ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
- fi
+ caldata_extract "0:art" 0x5000 0x2f20
+ ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
;;
esac
;;
"ath10k/pre-cal-pci-0002:01:00.0.bin")
case $board in
edgecore,ecw5410)
- 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
+ caldata_extract "0:art" 0x5000 0x2f20
;;
esac
;;
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh b/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
index 8be737d2da..9645b64671 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
@@ -2,8 +2,6 @@
asrock_bootconfig_mangle() {
local mtdnum="$(find_mtd_index 0:bootconfig)"
- # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
- [ -n "$mtdnum" ] || mtdnum="$(find_mtd_index 0:BOOTCONFIG)"
if [ -z "$mtdnum" ]; then
echo "cannot find bootconfig mtd partition"
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
index 50f8a3ceaf..f5501822f3 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
@@ -91,9 +91,6 @@ zyxel_do_upgrade() {
case "$board" in
zyxel,nbg6817)
local dualflagmtd="$(find_mtd_part 0:dual_flag)"
- # XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
- [ -b $dualflagmtd ] || \
- dualflagmtd="$(find_mtd_part 0:DUAL_FLAG)"
[ -b $dualflagmtd ] || return 1
case "$rootfs" in
More information about the lede-commits
mailing list