From: Jonathan Thibault <jonathan@navigue.com>
Date: Tue, 4 Dec 2018 19:59:31 +0000 (-0500)
Subject: octeon: Evaluate board names in alphabetical order
X-Git-Tag: v19.07.0-rc1~2008
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e93e2b631884e233a0c00b6348e67115aa6f7f9d;p=oweals%2Fopenwrt.git

octeon: Evaluate board names in alphabetical order

Signed-off-by: Jonathan Thibault <jonathan@navigue.com>
---

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`