[meta-zephyr][PATCH 1/2] zephyr-bsp/qemu-cortex-a53: run testimage

[Jon Mason <jon.mason@arm.com>]

Make the changes necessary to get testimage working and run it as part
of CI

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml                                    | 1 +
 ci/qemu-cortex-a53.yml                            | 4 ++++
 meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 145aefd..e0bf84e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,7 @@ qemu-cortex-a53:
   parallel:
     matrix:
       - TOOLCHAIN: [default, zephyr-toolchain]
+        TESTING: testimage
 
 qemu-cortex-m0:
   extends: .build
diff --git a/ci/qemu-cortex-a53.yml b/ci/qemu-cortex-a53.yml
index e77da8b..ca8b649 100644
--- a/ci/qemu-cortex-a53.yml
+++ b/ci/qemu-cortex-a53.yml
@@ -3,4 +3,8 @@ header:
   includes:
     - ci/base.yml
 
+local_conf_header:
+  failing_tests: |
+    ZEPHYRTESTS:remove = "interrupt"
+
 machine: qemu-cortex-a53
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
index b97cde7..97e536e 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
@@ -9,9 +9,10 @@ TCLIBC = "newlib"
 
 # For runqemu
 QB_SYSTEM_NAME = "qemu-system-aarch64"
-QB_MACHINE = "-machine virt"
+QB_MACHINE = "-machine virt,secure=on,gic-version=3"
 QB_CPU = "-cpu cortex-a53"
 QB_OPT_APPEND = "-nographic -vga none"
+QB_OPT_APPEND = "-icount shift=4,align=off,sleep=on -rtc clock=vm"
 
 # Zephyr RTOS settings
 ZEPHYR_BOARD = "qemu_cortex_a53"
-- 
2.17.1