mvebu: fix regression for non-generic ESPRESSObin versions

[openwrt/openwrt.git] / target / linux / mvebu / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index 77578e28d42fb7ca5e3f057e42ac5818e851736f..a7d5f451c51424261d0c37225e1e33c82becddc4 100755 (executable)
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -3,24 +3,29 @@
 # Copyright (C) 2016 LEDE-Project.org
 #
 
-. /lib/mvebu.sh
-
-RAMFS_COPY_DATA=/lib/mvebu.sh
+RAMFS_COPY_BIN='fw_printenv fw_setenv'
+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
 REQUIRE_IMAGE_METADATA=1
 
 platform_check_image() {
-       return 0
+       case "$(board_name)" in
+       cznic,turris-omnia|globalscale,espressobin|marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1)
+               platform_check_image_sdcard "$ARGV"
+               ;;
+       *)
+               return 0
+               ;;
+       esac
 }
 
 platform_do_upgrade() {
-       local board=$(mvebu_board_name)
-
-       case "$board" in
-       armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
+       case "$(board_name)" in
+       linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
                platform_do_upgrade_linksys "$ARGV"
                ;;
-       armada-388-clearfog)
-               platform_do_upgrade_clearfog "$ARGV"
+       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"
                ;;
        *)
                default_do_upgrade "$ARGV"
@@ -28,21 +33,12 @@ platform_do_upgrade() {
        esac
 }
 platform_copy_config() {
-       local board=$(mvebu_board_name)
-
-       case "$board" in
-       armada-388-clearfog)
-               platform_copy_config_clearfog "$ARGV"
+       case "$(board_name)" in
+       linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
+               platform_copy_config_linksys
+               ;;
+       cznic,turris-omnia|globalscale,espressobin|marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1)
+               platform_copy_config_sdcard "$ARGV"
                ;;
        esac
 }
-
-disable_watchdog() {
-       killall watchdog
-       ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
-               echo 'Could not disable watchdog'
-               return 1
-       }
-}
-
-append sysupgrade_pre_upgrade disable_watchdog