From: Rafał Miłecki <zajec5@gmail.com>
Date: Tue, 21 Apr 2015 11:04:38 +0000 (+0000)
Subject: bcm53xx: sysupgrade: improve NAND warnings
X-Git-Tag: reboot~3196
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=457d9caf4db7e28eb50a4a46f456373d463de394;p=openwrt%2Fstaging%2Fxback.git

bcm53xx: sysupgrade: improve NAND warnings

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45546
---

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index f26cce067d..e53c2513d2 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -141,7 +141,10 @@ platform_pre_upgrade() {
 
 	# Firmwares without UBI image should be flashed "normally"
 	local root_type=$(identify $dir/root)
-	[ "$root_type" != "ubi" ] && return
+	[ "$root_type" != "ubi" ] && {
+		echo "Provided firmware doesn't use UBI for rootfs."
+		return
+	}
 
 	# Prepare TRX file with just a kernel that will replace current one
 	local linux_length=$(grep "\"linux\"" /proc/mtd | sed "s/mtd[0-9]*:[ \t]*\([^ \t]*\).*/\1/")
@@ -174,7 +177,7 @@ platform_do_upgrade() {
 	local trx="$1"
 
 	[ "$(platform_flash_type)" == "nand" ] && {
-		echo "Flashing firmware without UBI for rootfs. All erase counters will be lost."
+		echo "Writing whole image to NAND flash. All erase counters will be lost."
 	}
 
 	case "$file_type" in