From: Rafał Miłecki <rafal@milecki.pl>
Date: Fri, 12 Jul 2019 12:05:49 +0000 (+0200)
Subject: ramips: get rid of platform_pre_upgrade()
X-Git-Tag: v21.02.0-rc1~5522
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=d9593b0809e42e9d75cc3ac4407ec30faaf70b15

ramips: get rid of platform_pre_upgrade()

The only step between platform_pre_upgrade() and platform_do_upgrade()
is switching to ramdisk. It should be fine to "mtd erase firmware" from
the later callback and get rid of the first one.

This change wasn't tested on affected target but identical code logic
was verified to work as expected on brcm47xx with initramfs firmware.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index c71ffc0321..4eaaffe029 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -9,18 +9,6 @@ platform_check_image() {
 	return 0
 }
 
-platform_pre_upgrade() {
-	local board=$(board_name)
-
-	case "$board" in
-	mikrotik,rb750gr3|\
-	mikrotik,rbm11g|\
-	mikrotik,rbm33g)
-		[ -z "$(rootfs_type)" ] && mtd erase firmware
-		;;
-	esac
-}
-
 platform_nand_pre_upgrade() {
 	local board=$(board_name)
 
@@ -35,6 +23,14 @@ platform_nand_pre_upgrade() {
 platform_do_upgrade() {
 	local board=$(board_name)
 
+	case "$board" in
+	mikrotik,rb750gr3|\
+	mikrotik,rbm11g|\
+	mikrotik,rbm33g)
+		[ -z "$(rootfs_type)" ] && mtd erase firmware
+		;;
+	esac
+
 	case "$board" in
 	hiwifi,hc5962|\
 	netgear,r6220|\