From da77e7517a7fc4b1cabc6f169f800d104f931bb1 Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Mon, 22 Jun 2020 16:36:51 +0100
Subject: corstone700: a5ds: adding support for poky-tiny

This patch sets corstone700-fvp machine as default
and selects poky-tiny distro for corstone700 and
a5ds platforms

Change-Id: I2e241cc3d68b461c73783b7db642b593fcde1d98
---
 run_model.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/run_model.sh b/run_model.sh
index f481e73..91061bc 100755
--- a/run_model.sh
+++ b/run_model.sh
@@ -28,20 +28,22 @@ fi
 
 cs700="Corstone-700"
 a5ds="CA5DS"
+YOCTO_DISTRO="poky-tiny"
+YOCTO_IMAGE="arm-poky-image"
 
 if [[ $1 =~ $cs700 ]]; then
 
   if [ -z "$MACHINE" ]; then
-    MACHINE="corstone7xx-fvp-initramfs"
+    MACHINE="corstone700-fvp"
   fi
 
-  echo "Corstone7xx: using $MACHINE machine"
+  echo "Corstone700: using $MACHINE machine , $YOCTO_DISTRO DISTRO"
 
-  OUTDIR=${BASEDIR}/../build-iota-tiny/tmp-iota_tiny/deploy/images/${MACHINE}
+  OUTDIR=${BASEDIR}/../build-${YOCTO_DISTRO}/tmp-$(echo ${YOCTO_DISTRO} | sed 's/-/_/g')/deploy/images/${MACHINE}
   DIRNAME=${MACHINE}
 
 else
-  OUTDIR=${BASEDIR}/../build-iota-tiny/tmp-iota_tiny/deploy/images/a5ds
+  OUTDIR=${BASEDIR}/../build-${YOCTO_DISTRO}/tmp-${echo ${YOCTO_DISTRO} | sed 's/-/_/g'}/deploy/images/a5ds
   DIRNAME=a5ds
 fi
 
@@ -51,7 +53,7 @@ then
     echo "================== Launching Corstone700 Model ==============================="
     $1 \
         -C se.trustedBootROMloader.fname="${OUTDIR}/se_romfw.bin" \
-        -C board.flashloader0.fname="${OUTDIR}/iota-tiny-image-${MACHINE}.wic.nopt" \
+        -C board.flashloader0.fname="${OUTDIR}/${YOCTO_IMAGE}-${MACHINE}.wic.nopt" \
         -C extsys_harness0.extsys_flashloader.fname="${OUTDIR}/es_flashfw.bin" \
         -C board.xnvm_size=64 \
         -C board.hostbridge.interfaceName="tap0" \
@@ -61,7 +63,7 @@ then
     echo "================== Launching CA5-DS Model ==============================="
     $1 \
       -C board.flashloader0.fname="${OUTDIR}/bl1.bin" \
-      --data css.cluster.cpu0="${OUTDIR}/iota-tiny-image-a5ds.wic@0x80000000" \
+      --data css.cluster.cpu0="${OUTDIR}/${YOCTO_IMAGE}-a5ds.wic@0x80000000" \
       $2
     else
        help
-- 
cgit v1.2.3