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

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

[Jon Mason]

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

[meta-zephyr][PATCH 2/2] zephyr-bsp: zephyr parameters update

[Jon Mason]

Update the parameters being run in qemu to get more stable results.
Values taken from zephyr qemu.  Also, use QB_GRAPHICS instead of
QB_OPT_APPEND for the relevant places.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml                                    | 3 ++-
 ci/qemu-cortex-m3.yml                             | 6 ------
 meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf | 2 +-
 meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf  | 4 ++--
 meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf  | 3 ++-
 meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf  | 2 +-
 meta-zephyr-bsp/conf/machine/qemu-x86.conf        | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0bf84e..082cd44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,8 @@ qemu-cortex-m0:
   extends: .build
   parallel:
     matrix:
-      - TESTING: testimage
+      - TOOLCHAIN: [default, zephyr-toolchain]
+        TESTING: testimage
 
 qemu-cortex-m3:
   extends: .build
diff --git a/ci/qemu-cortex-m3.yml b/ci/qemu-cortex-m3.yml
index b01480c..46fd551 100644
--- a/ci/qemu-cortex-m3.yml
+++ b/ci/qemu-cortex-m3.yml
@@ -3,10 +3,4 @@ header:
   includes:
     - ci/base.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common context pending poll sleep"
-  qemu_opts: |
-    QB_OPT_APPEND = "-icount shift=3,align=off,sleep=on -rtc clock=vm"
-
 machine: qemu-cortex-m3
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
index 97e536e..e21f3da 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
@@ -11,7 +11,7 @@ TCLIBC = "newlib"
 QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine virt,secure=on,gic-version=3"
 QB_CPU = "-cpu cortex-a53"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_OPT_APPEND = "-icount shift=4,align=off,sleep=on -rtc clock=vm"
 
 # Zephyr RTOS settings
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf
index 1cf2bb0..736579e 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf
@@ -14,9 +14,9 @@ TCLIBC = "newlib"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine microbit"
 QB_CPU = "-cpu cortex-m0"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_RNG = ""
-QB_OPT_APPEND = "-icount shift=6,align=off,sleep=on -rtc clock=vm"
+QB_OPT_APPEND = "-icount shift=6,align=off,sleep=off -rtc clock=vm"
 
 # Zephyr RTOS settings
 ZEPHYR_BOARD = "qemu_cortex_m0"
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
index 835a775..e6edefb 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
@@ -10,8 +10,9 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
 # For runqemu
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine lm3s6965evb"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_CPU = "-cpu cortex-m3"
 QB_RNG = ""
+QB_OPT_APPEND = "-icount shift=6,align=off,sleep=off -rtc clock=vm"
 
 ARCH:qemu-cortex-m3 = "arm"
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf
index 29b37d7..5a0ea69 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf
@@ -13,7 +13,7 @@ QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine xlnx-zcu102"
 QB_CPU = "-cpu cortex-r5"
 QB_MEM = "-m 64k"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
 QB_RNG = ""
 
 # Zephyr RTOS settings
diff --git a/meta-zephyr-bsp/conf/machine/qemu-x86.conf b/meta-zephyr-bsp/conf/machine/qemu-x86.conf
index ae7716c..0333d7c 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-x86.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-x86.conf
@@ -10,7 +10,7 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
 # For runqemu
 QB_SYSTEM_NAME = "qemu-system-i386"
 QB_MACHINE = "-machine type=pc-q35-2.10"
-QB_OPT_APPEND = "-nographic -no-acpi"
+QB_GRAPHICS = "-nographic -no-acpi"
 QB_CPU:x86 = "-cpu qemu32,+nx,+pae"
 QB_CPU_KVM:x86 = "-cpu kvm32"
 
-- 
2.17.1