From: Rafał Miłecki <ra...@milecki.pl>
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.
Signed-off-by: Rafał Miłecki <ra...@milecki.pl>
---
.../ar71xx/base-files/lib/upgrade/platform.sh | 50 +++++++++----------
1 file changed, 23 insertions(+), 27 deletions(-)
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"
--
2.21.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
