Add aarch32 support for AEMv8 model

run_model.sh takes a parameter to specify which arch the AEMv8 model
runs at: --arch32 or --aarch64.

It defaults to --aarch64 to maintain existing behaviour, but adding it
every time makes this script easier.

The Aarch32 version will run busybox and ALIP, which is an ARMv7 disk
image.  Linaro's OE disk image is for ARMv8 and we don't have an Android
disk image for Aarch32.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

1 files changed, 50 insertions, 26 deletions

diff --git a/platforms-fvp-test.sh b/platforms-fvp-test.sh
index 15609bb..f27bb27 100755
--- a/platforms-fvp-test.sh
+++ b/platforms-fvp-test.sh
@@ -23,7 +23,8 @@ function banner
 
 function run_test
 {
-	dir=$1
+	aarch=$1
+	dir=$2
 	str="$*"
 
 	if [ -e $dir ]; then
@@ -36,7 +37,7 @@ function run_test
 				exit 1
 			fi
 		fi
-		cmd="$modelscr $dir"
+		cmd="$modelscr --${aarch} $dir"
 		echo Using model command: $cmd
 		export NET=1
 		export MACADDR=00:02:F7:EF:67:E6
@@ -76,37 +77,60 @@ export CACHE_STATE_MODELLED=0
 export MODEL=$FOUNDATION_MODEL
 
 export DISK=
-run_test output/fvp-uefi/uefi     "Foundation Model - UEFI"
-run_test fvp-uefi                 "Foundation Model - UEFI"
-run_test output/fvp/fvp-uefi/uefi "Foundation Model - UEFI"
+run_test aarch64 aarch64 output/fvp-uefi/uefi     "Foundation Model - UEFI"
+run_test aarch64 fvp-uefi                 "Foundation Model - UEFI"
+run_test aarch64 output/fvp/fvp-uefi/uefi "Foundation Model - UEFI"
  
-run_test fvp-latest-busybox-uboot "Foundation Model - Latest - BusyBox - U-Boot"
-run_test fvp-lsk-busybox-uboot "Foundation Model - LSK - BusyBox - U-Boot"
-run_test output/fvp-busybox/uboot "Foundation Model - BusyBox - U-Boot"
-run_test output/fvp/fvp-busybox/uboot "Foundation Model - BusyBox - U-Boot"
+run_test aarch64 fvp-latest-busybox-uboot "Foundation Model - Latest - BusyBox - U-Boot"
+run_test aarch64 fvp-lsk-busybox-uboot "Foundation Model - LSK - BusyBox - U-Boot"
+run_test aarch64 output/fvp-busybox/uboot "Foundation Model - BusyBox - U-Boot"
+run_test aarch64 output/fvp/fvp-busybox/uboot "Foundation Model - BusyBox - U-Boot"
 
 export DISK=$OE_DISK
-run_test output/fvp-oe/uboot "Foundation Model - OpenEmbedded - U-Boot"
-run_test fvp-latest-oe-uboot "Foundation Model - OpenEmbedded - U-Boot"
-run_test output/fvp/fvp-oe/uboot "Foundation Model - OpenEmbedded - U-Boot"
-export MODEL=$AEMV8_MODEL
+run_test aarch64 output/fvp-oe/uboot "Foundation Model - OpenEmbedded - U-Boot"
+run_test aarch64 fvp-latest-oe-uboot "Foundation Model - OpenEmbedded - U-Boot"
+run_test aarch64 output/fvp/fvp-oe/uboot "Foundation Model - OpenEmbedded - U-Boot"
 
+export MODEL=$AEMV8_MODEL
 export DISK=
-run_test output/fvp-uefi/uefi     "AEMv8 Model - UEFI"
-run_test fvp-uefi                 "AEMv8 Model - UEFI"
-run_test output/fvp/fvp-uefi/uefi "AEMv8 Model - UEFI"
+run_test aarch64 output/fvp-uefi/uefi     "AEMv8 Model Aarch64 - UEFI"
+run_test aarch64 fvp-uefi                 "AEMv8 Model Aarch64 - UEFI"
+run_test aarch64 output/fvp/fvp-uefi/uefi "AEMv8 Model Aarch64 - UEFI"
 
-run_test fvp-latest-busybox-uboot "AEMv8 Model - Latest - BusyBox - U-Boot"
-run_test fvp-lsk-busybox-uboot "AEMv8 Model - LSK - BusyBox - U-Boot"
-run_test output/fvp-busybox/uboot "AEMv8 Model - BusyBox - U-Boot"
-run_test output/fvp/fvp-busybox/uboot "AEMv8 Model - BusyBox - U-Boot"
+run_test aarch64 fvp-latest-busybox-uboot "AEMv8 Model Aarch64 - Latest - BusyBox - U-Boot"
+run_test aarch64 fvp-lsk-busybox-uboot "AEMv8 Model Aarch64 - LSK - BusyBox - U-Boot"
+run_test aarch64 output/fvp-busybox/uboot "AEMv8 Model Aarch64 - BusyBox - U-Boot"
+run_test aarch64 output/fvp/fvp-busybox/uboot "AEMv8 Model Aarch64 - BusyBox - U-Boot"
 
 export DISK=$OE_DISK
-run_test output/fvp-oe/uboot "AEMv8 Model - OpenEmbedded - U-Boot"
-run_test fvp-latest-oe-uboot "AEMv8 Model - OpenEmbedded - U-Boot"
-run_test output/fvp/fvp-oe/uboot "AEMv8 Model - OpenEmbedded - U-Boot"
+run_test aarch64 output/fvp-oe/uboot "AEMv8 Model Aarch64 - OpenEmbedded - U-Boot"
+run_test aarch64 fvp-latest-oe-uboot "AEMv8 Model Aarch64 - OpenEmbedded - U-Boot"
+run_test aarch64 output/fvp/fvp-oe/uboot "AEMv8 Model Aarch64 - OpenEmbedded - U-Boot"
 
 export DISK=$ANDROID_DISK
-run_test fvp-lsk-android-uboot    "AEMv8 Model - Android - U-Boot"
-run_test output/fvp-android/uboot "AEMv8 Model - Android - U-Boot"
-run_test output/fvp/fvp-android/uboot "AEMv8 Model - Android - U-Boot"
+run_test aarch64 fvp-lsk-android-uboot    "AEMv8 Model Aarch64 - Android - U-Boot"
+run_test aarch64 output/fvp-android/uboot "AEMv8 Model Aarch64 - Android - U-Boot"
+run_test aarch64 output/fvp/fvp-android/uboot "AEMv8 Model Aarch64 - Android - U-Boot"
+
+export MODEL=$AEMV8_MODEL
+export DISK=
+run_test aarch32 output/fvp32-uefi/uefi     "AEMv8 Model Aarch32 - UEFI"
+run_test aarch32 fvp32-uefi                 "AEMv8 Model Aarch32 - UEFI"
+run_test aarch32 output/fvp32/fvp32-uefi/uefi "AEMv8 Model Aarch32 - UEFI"
+
+run_test aarch32 fvp32-latest-busybox-uboot "AEMv8 Model Aarch32 - Latest - BusyBox - U-Boot"
+run_test aarch32 fvp32-lsk-busybox-uboot "AEMv8 Model Aarch32 - LSK - BusyBox - U-Boot"
+run_test aarch32 output/fvp32-busybox/uboot "AEMv8 Model Aarch32 - BusyBox - U-Boot"
+run_test aarch32 output/fvp32/fvp32-busybox/uboot "AEMv8 Model Aarch32 - BusyBox - U-Boot"
+
+export DISK=$ALIPDISK
+run_test aarch32 output/fvp32-oe/uboot "AEMv8 Model Aarch32 - OpenEmbedded - U-Boot"
+run_test aarch32 fvp32-latest-oe-uboot "AEMv8 Model Aarch32 - OpenEmbedded - U-Boot"
+run_test aarch32 output/fvp32/fvp32-oe/uboot "AEMv8 Model Aarch32 - OpenEmbedded - U-Boot"
+
+if [ "$ANDROID32_DISK" != "" ]; then
+	export DISK=$ANDROID32_DISK
+	run_test aarch32 fvp32-lsk-android-uboot    "AEMv8 Model Aarch32 - Android - U-Boot"
+	run_test aarch32 output/fvp32-android/uboot "AEMv8 Model Aarch32 - Android - U-Boot"
+	run_test aarch32 output/fvp32/fvp32-android/uboot "AEMv8 Model Aarch32 - Android - U-Boot"
+fi