aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/base-files
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2021-03-20 11:48:26 +0100
committerChristian Lamparter <chunkeey@gmail.com>2021-12-03 12:23:02 +0100
commit5fb51d4516d27dcf72d2a1592abba922259ec8e5 (patch)
tree5f3ba5df36c0ed3a3e3c6f2ac8d1096538b688e4 /target/linux/ipq806x/base-files
parent25382dff8584ffc70917e9f693681fb7d9c06826 (diff)
downloadupstream-5fb51d4516d27dcf72d2a1592abba922259ec8e5.tar.gz
upstream-5fb51d4516d27dcf72d2a1592abba922259ec8e5.tar.bz2
upstream-5fb51d4516d27dcf72d2a1592abba922259ec8e5.zip
ipq806x: sysupgrade: drop unnecessary UBI to UBI logic
The purpose of this code seems to be to avoid issues caused by partially overwriting an existing UBI partition, where some of the erase counters would be reset but not the unmodified ones. This problem has been solved in a more generic way by the UBI EOF marker. This ensures that any old PEBs after the marker are properly initialized. It is therefore unnecessary to erase the whole partition before flashing a new OpenWrt factory image. Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'target/linux/ipq806x/base-files')
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/linksys.sh18
1 files changed, 1 insertions, 17 deletions
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
index 22771278ce..29f4763451 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
@@ -44,10 +44,6 @@ linksys_get_target_firmware() {
esac
}
-linksys_get_root_magic() {
- (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
-}
-
platform_do_upgrade_linksys() {
local magic_long="$(get_magic_long "$1")"
@@ -101,18 +97,6 @@ platform_do_upgrade_linksys() {
nand_upgrade_tar "$1"
}
[ "$magic_long" = "27051956" ] && {
- # check firmwares' rootfs types
- local oldroot="$(linksys_get_root_magic $target_mtd)"
- local newroot="$(linksys_get_root_magic "$1")"
-
- if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]
- # we're upgrading from a firmware with UBI to one with UBI
- then
- # erase everything to be safe
- mtd erase $part_label
- get_image "$1" | mtd -n write - $part_label
- else
- get_image "$1" | mtd write - $part_label
- fi
+ get_image "$1" | mtd write - $part_label
}
}