From 188328111b46ebc9592ee0f5cbcd2439d1c4aef0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 18 Dec 2017 20:32:18 +0100 Subject: treewide: move nand_do_upgrade call to platform_do_upgrade Calling nand_do_upgrade() from platform_pre_upgrade() was deprecated with 30f61a34b4cf ("base-files: always use staged sysupgrade"). Update the platform upgrade code to use platform_do_upgrade() for NAND images as well. Signed-off-by: Mathias Kresin --- .../apm821xx/base-files/lib/upgrade/platform.sh | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'target/linux/apm821xx/base-files/lib') diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index a45af7d054..ced8ce197a 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -18,21 +18,6 @@ platform_check_image() { esac } -platform_pre_upgrade() { - local board=$(board_name) - - case "$board" in - meraki,mr24|\ - meraki,mx60|\ - netgear,wndr4700) - nand_do_upgrade "$1" - ;; - - *) - ;; - esac -} - platform_do_upgrade() { local board=$(board_name) @@ -41,7 +26,11 @@ platform_do_upgrade() { wd,mybooklive-duo) mbl_do_upgrade "$ARGV" ;; - + meraki,mr24|\ + meraki,mx60|\ + netgear,wndr4700) + nand_do_upgrade "$1" + ;; *) default_do_upgrade "$ARGV" ;; -- cgit v1.2.3