From patchwork Sun Nov 25 09:10:40 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: fff-sysupgrade: merge SOC and SUBTARGET
From: Christian Dresel <fff@chrisi01.de>
X-Patchwork-Id: 953
Message-Id: <20181125091040.24758-1-fff@chrisi01.de>
To: franken-dev@freifunk.net
Date: Sun, 25 Nov 2018 10:10:40 +0100

This make it easier to use new targets without subtarget.

Signed-off-by: Christian Dresel <fff@chrisi01.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > 
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > 
---
 src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index dca21a1..87ac48a 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name)
 #decide SOC
 case $BOARD in
     tl-wdr4900-v1 )
-        SOC="mpc85xx"
-        SUBTARGET="g"
+        SOC="mpc85xx-g"
         ;;
     * )
-        SOC="ar71xx"
-        SUBTARGET="t"
+        SOC="ar71xx-t"
         ;;
 esac
 echo ""
@@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then
   done
 fi
 
-FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs-sysupgrade.bin"
+FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin"
 echo "Downloading $FILE"
 echo ""
 wget "${UPGRADE_PATH}/${FILE}"