stage2 passes image path to platform_do_upgrade() as an argument so it
can be simply accessed using $1
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
16 files changed:
case "$board" in
wd,mybooklive)
case "$board" in
wd,mybooklive)
;;
meraki,mr24|\
meraki,mx60|\
;;
meraki,mr24|\
meraki,mx60|\
nand_do_upgrade "$1"
;;
*)
nand_do_upgrade "$1"
;;
*)
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
else
PART_NAME="firmware"
fi
else
PART_NAME="firmware"
fi
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
;;
"43493030")
if [ -z "$fw_mtd" ]; then
;;
"43493030")
if [ -z "$fw_mtd" ]; then
- dir825b_do_upgrade_combined "firmware" "$ARGV"
+ dir825b_do_upgrade_combined "firmware" "$1"
case "$board" in
all0258n)
case "$board" in
all0258n)
- platform_do_upgrade_allnet "0x9f050000" "$ARGV"
+ platform_do_upgrade_allnet "0x9f050000" "$1"
pb44|\
routerstation|\
routerstation-pro)
pb44|\
routerstation|\
routerstation-pro)
- platform_do_upgrade_combined "$ARGV"
+ platform_do_upgrade_combined "$1"
- platform_do_upgrade_allnet "0x9f080000" "$ARGV"
+ platform_do_upgrade_allnet "0x9f080000" "$1"
;;
cap4200ag|\
eap300v2|\
ens202ext)
;;
cap4200ag|\
eap300v2|\
ens202ext)
- platform_do_upgrade_allnet "0xbf0a0000" "$ARGV"
+ platform_do_upgrade_allnet "0xbf0a0000" "$1"
;;
dir-825-b1|\
tew-673gru)
;;
dir-825-b1|\
tew-673gru)
- platform_do_upgrade_dir825b "$ARGV"
+ platform_do_upgrade_dir825b "$1"
om5p-ac|\
om5p-acv2|\
om5p-an)
om5p-ac|\
om5p-acv2|\
om5p-an)
- platform_do_upgrade_openmesh "$ARGV"
+ platform_do_upgrade_openmesh "$1"
uap-pro|\
unifi-outdoor-plus)
MTD_CONFIG_ARGS="-s 0x180000"
uap-pro|\
unifi-outdoor-plus)
MTD_CONFIG_ARGS="-s 0x180000"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
- platform_do_upgrade_compex "$ARGV"
+ platform_do_upgrade_compex "$1"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
case "$board" in
jjplus,ja76pf2)
case "$board" in
jjplus,ja76pf2)
- redboot_fis_do_upgrade "$ARGV" linux
+ redboot_fis_do_upgrade "$1" linux
;;
ubnt,routerstation|\
ubnt,routerstation-pro)
;;
ubnt,routerstation|\
ubnt,routerstation-pro)
- redboot_fis_do_upgrade "$ARGV" kernel
+ redboot_fis_do_upgrade "$1" kernel
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
}
platform_do_upgrade() {
}
platform_do_upgrade() {
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
case "$board" in
dlink,dir-685)
PART_NAME=firmware
case "$board" in
dlink,dir-685)
PART_NAME=firmware
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
avm,fritzbox-7530 |\
avm,fritzrepeater-3000 |\
qxwlan,e2600ac-c2)
avm,fritzbox-7530 |\
avm,fritzrepeater-3000 |\
qxwlan,e2600ac-c2)
- nand_do_upgrade "$ARGV"
;;
asus,map-ac2200)
CI_KERNPART="linux"
;;
asus,map-ac2200)
CI_KERNPART="linux"
;;
linksys,ea6350v3 |\
linksys,ea8300)
;;
linksys,ea6350v3 |\
linksys,ea8300)
- platform_do_upgrade_linksys "$ARGV"
+ platform_do_upgrade_linksys "$1"
;;
meraki,mr33)
CI_KERNPART="part.safe"
;;
meraki,mr33)
CI_KERNPART="part.safe"
openmesh,a42 |\
openmesh,a62)
PART_NAME="inactive"
openmesh,a42 |\
openmesh,a62)
PART_NAME="inactive"
- platform_do_upgrade_openmesh "$ARGV"
+ platform_do_upgrade_openmesh "$1"
;;
zyxel,nbg6617)
zyxel_do_upgrade "$1"
;;
*)
;;
zyxel,nbg6617)
zyxel_do_upgrade "$1"
;;
*)
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
buffalo,wxr-2533dhp)
buffalo_upgrade_prepare_ubi
CI_ROOTPART="ubi_rootfs"
buffalo,wxr-2533dhp)
buffalo_upgrade_prepare_ubi
CI_ROOTPART="ubi_rootfs"
- nand_do_upgrade "$ARGV"
;;
compex,wpq864|\
netgear,d7800 |\
;;
compex,wpq864|\
netgear,d7800 |\
qcom,ipq8064-ap148 |\
qcom,ipq8064-ap161 |\
zyxel,nbg6817)
qcom,ipq8064-ap148 |\
qcom,ipq8064-ap161 |\
zyxel,nbg6817)
- nand_do_upgrade "$ARGV"
- platform_do_upgrade_linksys "$ARGV"
+ platform_do_upgrade_linksys "$1"
;;
tplink,c2600)
PART_NAME="os-image:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
;;
tplink,c2600)
PART_NAME="os-image:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
;;
tplink,vr2600v)
PART_NAME="kernel:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
;;
tplink,vr2600v)
PART_NAME="kernel:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
v "board=$board"
case "$board" in
avila | cambria )
v "board=$board"
case "$board" in
avila | cambria )
- platform_do_upgrade_combined "$ARGV"
+ platform_do_upgrade_combined "$1"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
case "$board" in
"linksys,audi"|\
"linksys,viper")
case "$board" in
"linksys,audi"|\
"linksys,viper")
- platform_do_upgrade_linksys "$ARGV"
+ platform_do_upgrade_linksys "$1"
- nand_do_upgrade "$ARGV"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
CI_UBIPART="nandubi"
CI_KERNPART="kernel${newbootsys}"
CI_ROOTPART="rootfs${newbootsys}"
CI_UBIPART="nandubi"
CI_KERNPART="kernel${newbootsys}"
CI_ROOTPART="rootfs${newbootsys}"
- nand_do_upgrade "$ARGV" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys)
+ nand_do_upgrade "$1" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys)
}
platform_check_image() {
}
platform_check_image() {
case "$board" in
traverse,ls1043v | \
traverse,ls1043s)
case "$board" in
traverse,ls1043v | \
traverse,ls1043s)
- platform_do_upgrade_traverse_nandubi "$ARGV"
+ platform_do_upgrade_traverse_nandubi "$1"
;;
*)
echo "Sysupgrade is not currently supported on $board"
;;
*)
echo "Sysupgrade is not currently supported on $board"
umount /tmp/recovery
;;
*)
umount /tmp/recovery
;;
*)
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
case "$board" in
ocedo,panda|\
sophos,red-15w-rev1)
case "$board" in
ocedo,panda|\
sophos,red-15w-rev1)
- nand_do_upgrade "$ARGV"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
platform_do_upgrade() {
case "$(board_name)" in
linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
platform_do_upgrade() {
case "$(board_name)" in
linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
- platform_do_upgrade_linksys "$ARGV"
+ platform_do_upgrade_linksys "$1"
;;
cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\
marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1)
;;
cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\
marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1)
- platform_do_upgrade_sdcard "$ARGV"
+ platform_do_upgrade_sdcard "$1"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
case "$board" in
ubiquiti,edgerouterx|\
ubiquiti,edgerouterx-sfp)
case "$board" in
ubiquiti,edgerouterx|\
ubiquiti,edgerouterx-sfp)
- platform_upgrade_ubnt_erx "$ARGV"
+ platform_upgrade_ubnt_erx "$1"
ubiquiti,edgerouterx-sfp|\
xiaomi,mir3g|\
xiaomi,mir3p)
ubiquiti,edgerouterx-sfp|\
xiaomi,mir3g|\
xiaomi,mir3p)
- nand_do_upgrade "$ARGV"
;;
tplink,archer-c50-v4)
MTD_ARGS="-t romfile"
;;
tplink,archer-c50-v4)
MTD_ARGS="-t romfile"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"
- default_do_upgrade "$ARGV"
+ default_do_upgrade "$1"