aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/base-files/lib/upgrade
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-07-17 11:32:54 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-07-22 14:27:37 +0200
commit1cbe0d659c4438cc6348093385a24e969aeadac0 (patch)
treef901d8057341186f0fe8a8bee22ae9398f54b649 /target/linux/ipq806x/base-files/lib/upgrade
parent3b30ff29757258a0e16f51a86cdbb2a74a67ff7e (diff)
downloadupstream-1cbe0d659c4438cc6348093385a24e969aeadac0.tar.gz
upstream-1cbe0d659c4438cc6348093385a24e969aeadac0.tar.bz2
upstream-1cbe0d659c4438cc6348093385a24e969aeadac0.zip
treewide: sysupgrade: get rid of platform_nand_pre_upgrade()
1) nand_do_upgrade() is always called by a target code 2) nand_do_upgrade() starts with calling platform_nand_pre_upgrade() It means there is no need for the platform_nand_pre_upgrade() callback at all. All code that was present there could bo moved & simplly called by a target right before the nand_do_upgrade(). Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/ipq806x/base-files/lib/upgrade')
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/platform.sh14
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh2
2 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index 5919613cb9..b61047ff70 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -21,10 +21,12 @@ platform_do_upgrade() {
netgear,r7500v2 |\
netgear,r7800 |\
qcom,ipq8064-ap148 |\
- qcom,ipq8064-ap161 |\
- zyxel,nbg6817)
+ qcom,ipq8064-ap161)
nand_do_upgrade "$1"
;;
+ zyxel,nbg6817)
+ zyxel_do_upgrade "$1"
+ ;;
linksys,ea8500)
platform_do_upgrade_linksys "$1"
;;
@@ -44,11 +46,3 @@ platform_do_upgrade() {
;;
esac
}
-
-platform_nand_pre_upgrade() {
- case "$(board_name)" in
- zyxel,nbg6817)
- zyxel_do_upgrade "$1"
- ;;
- esac
-}
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
index ba8e825956..33cd98339c 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
@@ -118,5 +118,7 @@ zyxel_do_upgrade() {
zyxel_do_flash $tar_file $kernel $rootfs $dualflagmtd
+ nand_do_upgrade "$1"
+
return 0
}