bcm53xx: MR26,MR32: use REQUIRE_IMAGE_METADATA

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>

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 0697d3dc80bb6472f24001b99df8e2d7fbc515bc..645688ac7c9eaa3ff345340c3f25cc40fa950d4c 100644 (file)
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -1,6 +1,7 @@
 RAMFS_COPY_BIN='osafeloader oseama otrx truncate'
 
 PART_NAME=firmware
+REQUIRE_IMAGE_METADATA=0
 
 BCM53XX_FW_FORMAT=
 BCM53XX_FW_BOARD_ID=
@@ -198,13 +199,10 @@ platform_check_image() {
 
        board="$(board_name)"
        case "$board" in
-       # Ideally, REQUIRE_IMAGE_METADATA=1 would suffice
-       # but this would require converting all other
-       # devices too.
        meraki,mr26 | \
        meraki,mr32)
-               nand_do_platform_check "${board//,/_}" "$1"
-               return $?
+               # NAND sysupgrade
+               return 0
                ;;
        *)
                platform_other_check_image "$1"
@@ -401,6 +399,7 @@ platform_do_upgrade() {
        case "$(board_name)" in
        meraki,mr26 | \
        meraki,mr32)
+               REQUIRE_IMAGE_METADATA=1
                CI_KERNPART="part.safe"
                nand_do_upgrade "$1"
                ;;