Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcm53xx: MR26,MR32: use REQUIRE_IMAGE_METADATA

Browse Source 
This patch adds "REQUIRE_IMAGE_METADATA=1" requirement for the MR26 and
MR32, with REQUIRE_IMAGE_METADATA explicitly 0 elsewhere. This is based
upon bcm63xx's base-files/lib/upgrade/platform.sh.

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16634
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Matthew Hagan 2021-09-05 22:25:07 +00:00 committed by Hauke Mehrtens
parent caf29ee97b
commit 3bd129f8e0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@ -1,6 +1,7 @@
RAMFS_COPY_BIN='osafeloader oseama otrx truncate' RAMFS_COPY_BIN='osafeloader oseama otrx truncate'
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=0
BCM53XX_FW_FORMAT= BCM53XX_FW_FORMAT=
BCM53XX_FW_BOARD_ID= BCM53XX_FW_BOARD_ID=
@ -198,13 +199,10 @@ platform_check_image() {
board="$(board_name)" board="$(board_name)"
case "$board" in case "$board" in
# Ideally, REQUIRE_IMAGE_METADATA=1 would suffice
# but this would require converting all other
# devices too.
meraki,mr26 | \ meraki,mr26 | \
meraki,mr32) meraki,mr32)
nand_do_platform_check "${board//,/_}" "$1" # NAND sysupgrade
return $? return 0
;; ;;
*) *)
platform_other_check_image "$1" platform_other_check_image "$1"
@ -401,6 +399,7 @@ platform_do_upgrade() {
case "$(board_name)" in case "$(board_name)" in
meraki,mr26 | \ meraki,mr26 | \
meraki,mr32) meraki,mr32)
REQUIRE_IMAGE_METADATA=1
CI_KERNPART="part.safe" CI_KERNPART="part.safe"
nand_do_upgrade "$1" nand_do_upgrade "$1"
;; ;;