aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/base-files
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-12-18 20:32:18 +0100
committerMathias Kresin <dev@kresin.me>2018-02-16 14:44:02 +0100
commit188328111b46ebc9592ee0f5cbcd2439d1c4aef0 (patch)
treeacf674c6db8e3004dcb3815ca34fc3092ec3adfb /target/linux/apm821xx/base-files
parentc4ac02ffca4e8b9ffe8c702abf4de4063d3097e6 (diff)
downloadupstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.tar.gz
upstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.tar.bz2
upstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.zip
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 <dev@kresin.me>
Diffstat (limited to 'target/linux/apm821xx/base-files')
-rwxr-xr-xtarget/linux/apm821xx/base-files/lib/upgrade/platform.sh21
1 files changed, 5 insertions, 16 deletions
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"
;;