aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/base-files
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-12-18 20:32:18 +0100
committerMathias Kresin <dev@kresin.me>2018-02-16 14:44:02 +0100
commit188328111b46ebc9592ee0f5cbcd2439d1c4aef0 (patch)
treeacf674c6db8e3004dcb3815ca34fc3092ec3adfb /target/linux/ar71xx/base-files
parentc4ac02ffca4e8b9ffe8c702abf4de4063d3097e6 (diff)
downloadupstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.tar.gz
upstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.tar.bz2
upstream-188328111b46ebc9592ee0f5cbcd2439d1c4aef0.zip
treewide: move nand_do_upgrade call to platform_do_upgrade
Calling nand_do_upgrade() from platform_pre_upgrade() was deprecated with 30f61a34b4cf ("base-files: always use staged sysupgrade"). Update the platform upgrade code to use platform_do_upgrade() for NAND images as well. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ar71xx/base-files')
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh86
1 files changed, 43 insertions, 43 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 2e7d298ec2..6f1a3ba1c9 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -687,45 +687,6 @@ platform_pre_upgrade() {
local board=$(board_name)
case "$board" in
- c-60|\
- hiveap-121|\
- nbg6716|\
- r6100|\
- rambutan|\
- rb-411|\
- rb-411u|\
- rb-433|\
- rb-433u|\
- rb-435g|\
- rb-450|\
- rb-450g|\
- rb-493|\
- rb-493g|\
- rb-750|\
- rb-750gl|\
- rb-751|\
- rb-751g|\
- rb-911g-2hpnd|\
- rb-911g-5hpacd|\
- rb-911g-5hpnd|\
- rb-912uag-2hpnd|\
- rb-912uag-5hpnd|\
- rb-921gs-5hpacd-r2|\
- rb-951g-2hnd|\
- rb-951ui-2hnd|\
- rb-2011il|\
- rb-2011l|\
- rb-2011uas|\
- rb-2011uas-2hnd|\
- rb-2011uias|\
- rb-2011uias-2hnd|\
- rb-sxt2n|\
- rb-sxt5n|\
- wi2a-ac200i|\
- wndr3700v4|\
- wndr4300)
- nand_do_upgrade "$1"
- ;;
rb-750-r2|\
rb-750p-pbr2|\
rb-750up-r2|\
@@ -743,10 +704,6 @@ platform_pre_upgrade() {
# erase firmware if booted from initramfs
[ -z "$(rootfs_type)" ] && mtd erase firmware
;;
- mr18|\
- z1)
- merakinand_do_upgrade "$1"
- ;;
esac
}
@@ -835,6 +792,49 @@ platform_do_upgrade() {
om5p-an)
platform_do_upgrade_openmesh "$ARGV"
;;
+ c-60|\
+ hiveap-121|\
+ nbg6716|\
+ r6100|\
+ rambutan|\
+ rb-411|\
+ rb-411u|\
+ rb-433|\
+ rb-433u|\
+ rb-435g|\
+ rb-450|\
+ rb-450g|\
+ rb-493|\
+ rb-493g|\
+ rb-750|\
+ rb-750gl|\
+ rb-751|\
+ rb-751g|\
+ rb-911g-2hpnd|\
+ rb-911g-5hpacd|\
+ rb-911g-5hpnd|\
+ rb-912uag-2hpnd|\
+ rb-912uag-5hpnd|\
+ rb-921gs-5hpacd-r2
+ rb-951g-2hnd|\
+ rb-951ui-2hnd|\
+ rb-2011il|\
+ rb-2011l|\
+ rb-2011uas|\
+ rb-2011uas-2hnd|\
+ rb-2011uias|\
+ rb-2011uias-2hnd|\
+ rb-sxt2n|\
+ rb-sxt5n|\
+ wi2a-ac200i|\
+ wndr3700v4|\
+ wndr4300)
+ nand_do_upgrade "$1"
+ ;;
+ mr18|\
+ z1)
+ merakinand_do_upgrade "$1"
+ ;;
uap-pro|\
unifi-outdoor-plus)
MTD_CONFIG_ARGS="-s 0x180000"