aboutsummaryrefslogtreecommitdiffstats
path: root/target
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
commit3be08a4b90cec85e1e8c72f3b590e9a7444dafca (patch)
tree4ebc312001220113858ab588795e2c68c70d1023 /target
parent3e9dd9c10f5430c62ef88b8b8b11958f35482183 (diff)
downloadmaster-187ad058-3be08a4b90cec85e1e8c72f3b590e9a7444dafca.tar.gz
master-187ad058-3be08a4b90cec85e1e8c72f3b590e9a7444dafca.tar.bz2
master-187ad058-3be08a4b90cec85e1e8c72f3b590e9a7444dafca.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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