aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-05-27 19:03:22 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-05-27 19:03:22 +0000
commit952b6f2b0538f528b6db3202da83fb46cb982594 (patch)
treecf1e1af5dc94146a9a8f61ed8be5cc2e3b2d36d9
parentc31530e98dfd1afd94fbe7c14de4fe1a9ea80a1d (diff)
downloadmaster-187ad058-952b6f2b0538f528b6db3202da83fb46cb982594.tar.gz
master-187ad058-952b6f2b0538f528b6db3202da83fb46cb982594.tar.bz2
master-187ad058-952b6f2b0538f528b6db3202da83fb46cb982594.zip
mvebu: make flashing more safe
Turn on the auto recovery feature when flashing and turn it off on successful bootup. Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45792 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/init.d/u-boot_env14
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/linksys.sh5
2 files changed, 18 insertions, 1 deletions
diff --git a/target/linux/mvebu/base-files/etc/init.d/u-boot_env b/target/linux/mvebu/base-files/etc/init.d/u-boot_env
new file mode 100755
index 0000000000..82f36cb71f
--- /dev/null
+++ b/target/linux/mvebu/base-files/etc/init.d/u-boot_env
@@ -0,0 +1,14 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2015 OpenWrt.org
+
+START=97
+boot() {
+. /lib/functions.sh
+. /lib/mvebu.sh
+
+case $(mvebu_board_name) in
+ armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba)
+ fw_setenv auto_recovery off
+ ;;
+esac
+}
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index f37831ba75..fc403332bd 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
#
linksys_get_target_firmware() {
@@ -19,6 +19,9 @@ linksys_get_target_firmware() {
fw_setenv bootcmd "run nandboot"
fi
+ # re-enable recovery so we get back if the new firmware is broken
+ fw_setenv auto_recovery yes
+
echo "$target_firmware"
}