aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-12 12:04:13 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-12 12:04:13 +0000
commit95ef64a7792801135740073208b3e31322f948c8 (patch)
tree12e90ec1a32dbaa74566373cf683d79f97fa6ff2
parent24d40980b0822dff89d8ae75eedd85fa98df2cc1 (diff)
downloadupstream-95ef64a7792801135740073208b3e31322f948c8.tar.gz
upstream-95ef64a7792801135740073208b3e31322f948c8.tar.bz2
upstream-95ef64a7792801135740073208b3e31322f948c8.zip
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
-rw-r--r--target/linux/bcm53xx/base-files/lib/upgrade/platform.sh5
1 files changed, 2 insertions, 3 deletions
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