From 34d3eaff4a253e680b1e1439dcb5f9c7d011c8cb Mon Sep 17 00:00:00 2001 From: Brett Mastbergen Date: Tue, 25 Jun 2019 16:03:48 -0400 Subject: [PATCH] mvebu: Fix platform.sh for non-generic espressobin versions When the non-generic espressobin targets were added these board checks were not updated. One side effect of this is that config is not saved during an upgrade of -emmc,-v7, or -v7-emmc devices. Signed-off-by: Brett Mastbergen (cherry picked from commit 95c1dc5e8678a1fd87234a4d77c8c6643703023c) --- target/linux/mvebu/base-files/lib/upgrade/platform.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index a7d5f451c5..b86fd1477e 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -9,7 +9,8 @@ REQUIRE_IMAGE_METADATA=1 platform_check_image() { case "$(board_name)" in - cznic,turris-omnia|globalscale,espressobin|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_check_image_sdcard "$ARGV" ;; *) @@ -37,7 +38,8 @@ platform_copy_config() { 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) + 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_copy_config_sdcard "$ARGV" ;; esac -- 2.30.2