aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-07-12 14:05:49 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-07-16 19:03:42 +0200
commitd9593b0809e42e9d75cc3ac4407ec30faaf70b15 (patch)
tree4f52580492a5e3458e5b785470500203a1babc82
parent20452a8db9f90e5f1d0733363a488be522cd5c0f (diff)
downloadupstream-d9593b0809e42e9d75cc3ac4407ec30faaf70b15.tar.gz
upstream-d9593b0809e42e9d75cc3ac4407ec30faaf70b15.tar.bz2
upstream-d9593b0809e42e9d75cc3ac4407ec30faaf70b15.zip
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>
-rwxr-xr-xtarget/linux/ramips/base-files/lib/upgrade/platform.sh20
1 files changed, 8 insertions, 12 deletions
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)
@@ -36,6 +24,14 @@ 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|\
netgear,r6350|\