aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu/base-files')
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/init.d/bootcount18
-rwxr-xr-xtarget/linux/mvebu/base-files/etc/init.d/linksys_recovery20
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/linksys.sh53
3 files changed, 54 insertions, 37 deletions
diff --git a/target/linux/mvebu/base-files/etc/init.d/bootcount b/target/linux/mvebu/base-files/etc/init.d/bootcount
new file mode 100755
index 0000000000..6e8e310849
--- /dev/null
+++ b/target/linux/mvebu/base-files/etc/init.d/bootcount
@@ -0,0 +1,18 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+start() {
+ . /lib/functions.sh
+
+ case $(board_name) in
+ linksys,caiman |\
+ linksys,cobra |\
+ linksys,mamba |\
+ linksys,rango |\
+ linksys,shelby |\
+ linksys,venom)
+ mtd resetbc s_env || true
+ ;;
+ esac
+}
diff --git a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
deleted file mode 100755
index b4f375ec99..0000000000
--- a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015-2016 OpenWrt.org
-# Copyright (C) 2016 LEDE-Project.org
-
-START=97
-boot() {
-. /lib/functions.sh
-
-case $(board_name) in
- linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
- # make sure auto_recovery in uboot is always on
- AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
- if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then
- fw_setenv auto_recovery yes
- fi
- # reset the boot counter
- mtd resetbc s_env
- ;;
-esac
-}
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index aacaf55667..3f45d6cac5 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -3,26 +3,45 @@
#
linksys_get_target_firmware() {
+
+ local cur_boot_part mtd_ubi0
+
cur_boot_part=`/usr/sbin/fw_printenv -n boot_part`
- target_firmware=""
- if [ "$cur_boot_part" = "1" ]
- then
- # current primary boot - update alt boot
- target_firmware="kernel2"
- fw_setenv boot_part 2
- fw_setenv bootcmd "run altnandboot"
- elif [ "$cur_boot_part" = "2" ]
- then
- # current alt boot - update primary boot
- target_firmware="kernel1"
- fw_setenv boot_part 1
- fw_setenv bootcmd "run nandboot"
+ if [ -z "${cur_boot_part}" ] ; then
+ mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num)
+ case $(egrep ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in
+ kernel1|rootfs1)
+ cur_boot_part=1
+ ;;
+ kernel2|rootfs2)
+ cur_boot_part=2
+ ;;
+ esac
+ >&2 printf "Current boot_part='%s' selected from ubi0/mtd_num='%s'" \
+ "${cur_boot_part}" "${mtd_ubi0}"
fi
- # re-enable recovery so we get back if the new firmware is broken
- fw_setenv auto_recovery yes
-
- echo "$target_firmware"
+ case $cur_boot_part in
+ 1)
+ fw_setenv -s - <<-EOF
+ boot_part 2
+ bootcmd "run altnandboot"
+ EOF
+ printf "kernel2"
+ return
+ ;;
+ 2)
+ fw_setenv -s - <<-EOF
+ boot_part 1
+ bootcmd "run nandboot"
+ EOF
+ printf "kernel1"
+ return
+ ;;
+ *)
+ return
+ ;;
+ esac
}
linksys_get_root_magic() {