From f028dc0e8b97f4d271e29b62ef403a6a63be72cb Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Wed, 15 Dec 2021 10:41:45 -0500
Subject: [PATCH] arm-bsp: add zephyr for musca-s1

Zephyr supports musca-s1 boards.  Add support in the machine config file
and the relevant CI entries to build it.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/musca-s1.yml                         |  4 +++-
 meta-arm-bsp/conf/machine/musca-s1.conf | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ci/musca-s1.yml b/ci/musca-s1.yml
index 29f289a3..523a2350 100644
--- a/ci/musca-s1.yml
+++ b/ci/musca-s1.yml
@@ -2,9 +2,11 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/meta-openembedded.yml
+    - ci/meta-zephyr.yml
+
 
 machine: musca-s1
 
 target:
   - trusted-firmware-m
+  - zephyr-philosophers
diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf
index be15c60e..d18c06c2 100644
--- a/meta-arm-bsp/conf/machine/musca-s1.conf
+++ b/meta-arm-bsp/conf/machine/musca-s1.conf
@@ -9,4 +9,19 @@ require conf/machine/include/arm/armv8-m/tune-cortexm33.inc
 # GLIBC will not work with Cortex-M.
 TCLIBC = "newlib"
 
+# For runqemu
+IMAGE_FSTYPES += "ext4"
+IMAGE_CLASSES += "qemuboot"
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine musca-s1"
+QB_CPU = "-cpu cortex-m33"
+QB_OPT_APPEND = "-nographic -vga none"
+QB_MEM = "512k"
+QB_RNG = ""
+
+# Zephyr RTOS settings
+ZEPHYR_BOARD = "v2m_musca_s1"
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+ARCH:musca-s1 = "arm"
+
 TFM_PLATFORM = "arm/musca_s1"