domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: nbg6817: case-insensitive qcom-smem partitions

Browse Source 
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>
This commit is contained in:
Stefan Lippers-Hollmann
2021-05-07 00:44:03 +02:00
committed by Petr Štetiar
parent d62825dd77
commit 2db9dded0a
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/ipq806x/base-files/etc/board.d/02_network
View File

@@ -69,7 +69,10 @@ ubnt,unifi-ac-hd)
ucidef_set_interface_lan "eth0 eth1" ucidef_set_interface_lan "eth0 eth1"
;; ;;
zyxel,nbg6817) zyxel,nbg6817)
hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 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" \ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0" "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)" ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"

20
target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@@ -45,8 +45,14 @@ case "$FIRMWARE" in
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1) ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1)
;; ;;
zyxel,nbg6817) zyxel,nbg6817)
caldata_extract "0:ART" 0x1000 0x2f20 if [ -b "$(find_mtd_part 0:art)" ]; then
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1) 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
;; ;;
esac esac
;; ;;
@@ -85,8 +91,14 @@ case "$FIRMWARE" in
ath10k_patch_mac $(mtd_get_mac_binary default-mac 0x0) ath10k_patch_mac $(mtd_get_mac_binary default-mac 0x0)
;; ;;
zyxel,nbg6817) zyxel,nbg6817)
caldata_extract "0:ART" 0x5000 0x2f20 if [ -b "$(find_mtd_part 0:art)" ]; then
ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 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
;; ;;
esac esac
;; ;;

5
target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
View File

@@ -90,7 +90,10 @@ zyxel_do_upgrade() {
[ -b "${rootfs}" ] || return 1 [ -b "${rootfs}" ] || return 1
case "$board" in case "$board" in
zyxel,nbg6817) zyxel,nbg6817)
local dualflagmtd="$(find_mtd_part 0:DUAL_FLAG)" 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 [ -b $dualflagmtd ] || return 1
case "$rootfs" in case "$rootfs" in