ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 16:58:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ath79: get rid of BOARD_NAME for Mikrotik RouterBOARD

Browse Source 
So far, specifying "BOARD_NAME := routerboard" is required by the
upgrade code of Mikrotik NAND devices, as "sysupgrade-routerboard"
is hardcoded in platform_do_upgrade_mikrotik_nand().

This patch replaces the latter with a grep for the name like it
is already done in nand_upgrade_tar() in /lib/upgrade/nand.sh.

By that, BOARD_NAME is obsolete now for this device.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-02-26 15:53:30 +01:00
parent 281785d74f
commit 3d8be08939
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/ath79/image/mikrotik.mk
View File

@ -4,7 +4,6 @@ define Device/mikrotik_routerboard-922uags-5hpacd
$(Device/mikrotik) $(Device/mikrotik)
SOC := qca9558 SOC := qca9558
DEVICE_MODEL := RouterBOARD 922UAGS-5HPacD DEVICE_MODEL := RouterBOARD 922UAGS-5HPacD
BOARD_NAME := routerboard
IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 2048 -e -c | \ IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 2048 -e -c | \
sysupgrade-tar kernel=$$$$@ | append-metadata sysupgrade-tar kernel=$$$$@ | append-metadata
DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct \ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct \

8
target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
View File

@ -12,11 +12,17 @@ RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
platform_do_upgrade_mikrotik_nand() { platform_do_upgrade_mikrotik_nand() {
CI_KERNPART=none CI_KERNPART=none
local fw_mtd=$(find_mtd_part kernel) local fw_mtd=$(find_mtd_part kernel)
fw_mtd="${fw_mtd/block/}" fw_mtd="${fw_mtd/block/}"
[ -n "$fw_mtd" ] || return [ -n "$fw_mtd" ] || return
local board_dir=$(tar tf "$1" | grep -m 1 '^sysupgrade-.*/$')
board_dir=${board_dir%/}
[ -n "$board_dir" ] || return
mtd erase kernel mtd erase kernel
tar xf "$1" sysupgrade-routerboard/kernel -O | nandwrite -o "$fw_mtd" - tar xf "$1" ${board_dir}/kernel -O | nandwrite -o "$fw_mtd" -
nand_do_upgrade "$1" nand_do_upgrade "$1"
} }