domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: g10: 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 01:00:58 +02:00
committed by Petr Štetiar
parent 2db9dded0a
commit f70e11cd97
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,12 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin") "ath10k/pre-cal-pci-0000:01:00.0.bin")
case $board in case $board in
asrock,g10) asrock,g10)
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
;; ;;
buffalo,wxr-2533dhp) buffalo,wxr-2533dhp)
caldata_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
@@ -59,7 +64,12 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0001:01:00.0.bin") "ath10k/pre-cal-pci-0001:01:00.0.bin")
case $board in case $board in
asrock,g10) asrock,g10)
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
;; ;;
buffalo,wxr-2533dhp) buffalo,wxr-2533dhp)
caldata_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20

4
target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
View File

@@ -1,7 +1,9 @@
. /lib/functions.sh . /lib/functions.sh
asrock_bootconfig_mangle() { asrock_bootconfig_mangle() {
local mtdnum="$( find_mtd_index 0:BOOTCONFIG )" 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 if [ -z "$mtdnum" ]; then
echo "cannot find bootconfig mtd partition" echo "cannot find bootconfig mtd partition"