zephyr-bsp: zephyr parameters update

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>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>

.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

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

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

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"

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"

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

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"