aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
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/ipq40xx
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/ipq40xx')
-rw-r--r--target/linux/ipq40xx/base-files/lib/upgrade/platform.sh34
1 files changed, 11 insertions, 23 deletions
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index a5e39c280c..dac773d2fe 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -47,12 +47,22 @@ zyxel_do_upgrade() {
platform_do_upgrade() {
case "$(board_name)" in
8dev,jalapeno |\
- alfa-network,ap120c-ac |\
avm,fritzbox-7530 |\
avm,fritzrepeater-3000 |\
qxwlan,e2600ac-c2)
nand_do_upgrade "$1"
;;
+ alfa-network,ap120c-ac)
+ part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')"
+ if [ "$part" = "rootfs1" ]; then
+ fw_setenv active 2 || exit 1
+ CI_UBIPART="rootfs2"
+ else
+ fw_setenv active 1 || exit 1
+ CI_UBIPART="rootfs1"
+ fi
+ nand_do_upgrade "$1"
+ ;;
asus,map-ac2200)
CI_KERNPART="linux"
nand_do_upgrade "$1"
@@ -83,25 +93,3 @@ platform_do_upgrade() {
;;
esac
}
-
-platform_nand_pre_upgrade() {
- case "$(board_name)" in
- alfa-network,ap120c-ac)
- part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')"
- if [ "$part" = "rootfs1" ]; then
- fw_setenv active 2 || exit 1
- CI_UBIPART="rootfs2"
- else
- fw_setenv active 1 || exit 1
- CI_UBIPART="rootfs1"
- fi
- ;;
- asus,rt-ac58u)
- CI_UBIPART="UBI_DEV"
- CI_KERNPART="linux"
- ;;
- meraki,mr33)
- CI_KERNPART="part.safe"
- ;;
- esac
-}