aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut VARENE <hacks@slashdirt.org>2017-02-23 12:24:05 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-26 13:30:39 +0100
commited49d08762e2eb0a565568a5d48d4d8ffaa6ef30 (patch)
tree5920b6679d397359c1c290e5e2dee58c03eeb8a9
parentdf36b5e1b3d5de419a0c86b7d4bef99e7a8ecbb0 (diff)
downloadupstream-ed49d08762e2eb0a565568a5d48d4d8ffaa6ef30.tar.gz
upstream-ed49d08762e2eb0a565568a5d48d4d8ffaa6ef30.tar.bz2
upstream-ed49d08762e2eb0a565568a5d48d4d8ffaa6ef30.zip
ar71xx: mikrotik: erase firmware partition on SPI NOR devices in pre_upgrade()
On Mikrotik SPI NOR devices, the firmware partition must be erased when flashing from stock firmware, otherwise leftover bits (in particular a kernel signature) can trigger a boot loop. When booted from initramfs (the only way to flash LEDE on these devices), this patch unconditionally erases the firmware partition in the pre_upgrade() stage for all supported SPI NOR devices. Signed-off-by: Thibaut VARENE <hacks@slashdirt.org>
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index d48135a6d3..576ff6c06c 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -684,6 +684,14 @@ platform_pre_upgrade() {
wndr4300)
nand_do_upgrade "$1"
;;
+ rb-750-r2|\
+ rb-750up-r2|\
+ rb-941-2nd|\
+ rb-951ui-2nd|\
+ rb-mapl-2nd)
+ # erase firmware if booted from initramfs
+ [ -z "$(rootfs_type)" ] && mtd erase firmware
+ ;;
mr18|\
z1)
merakinand_do_upgrade "$1"