From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Apr 2017 19:27:04 +0000 (+0200)
Subject: ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade
X-Git-Tag: v18.06.0-rc1~2836
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9ab81e63cd398ae740bfadb9b318e6e0ec3712cc;p=openwrt%2Fstaging%2Fxback.git

ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade

All targets with NAND support should gradually move their nand_do_upgrade
calls from platform_pre_upgrade to platform_do_upgrade.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 6aad4c9601..f25d1e2a62 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -280,7 +280,7 @@ platform_nand_pre_upgrade() {
 	esac
 }
 
-platform_pre_upgrade() {
+platform_do_upgrade() {
 	local board=$(ramips_board_name)
 
 	case "$board" in
@@ -289,13 +289,6 @@ platform_pre_upgrade() {
     	ubnt-erx)
 		nand_do_upgrade "$ARGV"
 		;;
-	esac
-}
-
-platform_do_upgrade() {
-	local board=$(ramips_board_name)
-
-	case "$board" in
 	*)
 		default_do_upgrade "$ARGV"
 		;;