aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Thibault <jonathan@navigue.com>2018-12-04 14:59:31 -0500
committerJohn Crispin <john@phrozen.org>2018-12-06 08:42:22 +0100
commite93e2b631884e233a0c00b6348e67115aa6f7f9d (patch)
tree0f9a0fa0487c429af2925ba9a3c7ab9542f8914f
parent9ed180b000090ae48b5f172aaf4f8ad53b8bf4d7 (diff)
downloadupstream-e93e2b631884e233a0c00b6348e67115aa6f7f9d.tar.gz
upstream-e93e2b631884e233a0c00b6348e67115aa6f7f9d.tar.bz2
upstream-e93e2b631884e233a0c00b6348e67115aa6f7f9d.zip
octeon: Evaluate board names in alphabetical order
Signed-off-by: Jonathan Thibault <jonathan@navigue.com>
-rwxr-xr-xtarget/linux/octeon/base-files/lib/upgrade/platform.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index cd49c0da36..6d258dbb0f 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -62,12 +62,12 @@ platform_do_upgrade() {
[ -b "${rootfs}" ] || return 1
case "$board" in
- erlite)
- kernel=sda1
- ;;
er)
kernel=mmcblk0p1
;;
+ erlite)
+ kernel=sda1
+ ;;
*)
return 1
esac
@@ -82,8 +82,8 @@ platform_check_image() {
local board=$(board_name)
case "$board" in
- erlite | \
- er)
+ er | \
+ erlite)
local tar_file="$1"
local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`