From: Rafał Miłecki <rafal@milecki.pl>
Date: Fri, 12 Jul 2019 12:05:47 +0000 (+0200)
Subject: ar71xx: get rid of platform_pre_upgrade()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=20452a8db;p=openwrt%2Fstaging%2Flinusw.git

ar71xx: 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/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index d0690dbaf4..c0f383b4e3 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -746,33 +746,6 @@ platform_check_image() {
 	return 1
 }
 
-platform_pre_upgrade() {
-	local board=$(board_name)
-
-	case "$board" in
-	rb-750-r2|\
-	rb-750p-pbr2|\
-	rb-750up-r2|\
-	rb-911-2hn|\
-	rb-911-5hn|\
-	rb-931-2nd|\
-	rb-941-2nd|\
-	rb-951ui-2nd|\
-	rb-952ui-5ac2nd|\
-	rb-962uigs-5hact2hnt|\
-	rb-lhg-5nd|\
-	rb-map-2nd|\
-	rb-mapl-2nd|\
-	rb-sxt-2nd-r3|\
-	rb-wap-2nd|\
-	rb-wapg-5hact2hnd|\
-	rb-wapr-2nd)
-		# erase firmware if booted from initramfs
-		[ -z "$(rootfs_type)" ] && mtd erase firmware
-		;;
-	esac
-}
-
 platform_nand_pre_upgrade() {
 	local board=$(board_name)
 
@@ -808,6 +781,29 @@ platform_nand_pre_upgrade() {
 platform_do_upgrade() {
 	local board=$(board_name)
 
+	case "$board" in
+	rb-750-r2|\
+	rb-750p-pbr2|\
+	rb-750up-r2|\
+	rb-911-2hn|\
+	rb-911-5hn|\
+	rb-931-2nd|\
+	rb-941-2nd|\
+	rb-951ui-2nd|\
+	rb-952ui-5ac2nd|\
+	rb-962uigs-5hact2hnt|\
+	rb-lhg-5nd|\
+	rb-map-2nd|\
+	rb-mapl-2nd|\
+	rb-sxt-2nd-r3|\
+	rb-wap-2nd|\
+	rb-wapg-5hact2hnd|\
+	rb-wapr-2nd)
+		# erase firmware if booted from initramfs
+		[ -z "$(rootfs_type)" ] && mtd erase firmware
+		;;
+	esac
+
 	case "$board" in
 	all0258n)
 		platform_do_upgrade_allnet "0x9f050000" "$ARGV"