From: Rafał Miłecki <zajec5@gmail.com>
Date: Sun, 12 Apr 2015 12:04:13 +0000 (+0000)
Subject: bcm53xx: allow sysupgrade firmwares without UBI containing rootfs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95ef64a7792801135740073208b3e31322f948c8;p=openwrt%2Fstaging%2Fflorian.git

bcm53xx: allow sysupgrade firmwares without UBI containing rootfs

In most cases it allows reverting back to the vendor firmware (as they
usually don't use UBI). If users wants to do that we can't do anything
anyway. Erease counters will be just lost. The only thing we do is warn:
"Flashing firmware without UBI for rootfs. All erase counters will be
lost."
It still requires forcing sysupgrade.

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

SVN-Revision: 45392
---

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 26a32e30a4..f5505219b0 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -148,7 +148,7 @@ platform_pre_upgrade() {
 	local root_type=$(identify $dir/root)
 	[ "$root_type" != "ubi" ] && return
 
-	echo "Provided firmware contains kernel and UBI image, but flashing it in unsupported yet"
+	echo "Provided firmware contains kernel and UBI image, but flashing it is unsupported yet"
 	exit 1
 }
 
@@ -157,8 +157,7 @@ platform_do_upgrade() {
 	local trx="$1"
 
 	[ "$(platform_flash_type)" == "nand" ] && {
-		echo "Firmware upgrade on NAND devices is REALLY unsupported."
-		return
+		echo "Flashing firmware without UBI for rootfs. All erase counters will be lost."
 	}
 
 	case "$file_type" in