[meta-zephyr][PATCH 1/2] CI: pin to kas 3.2 as 3.2.1 fails

[meta-zephyr][PATCH 1/2] CI: pin to kas 3.2 as 3.2.1 fails

[Jon Mason]

From: Ross Burton <ross.burton@arm.com>

For some reason the kas 3.2.1 container fails:

No such file or directory: '/builds/engineering/yocto/meta-zephyr/ci/ci/base.yml'

Note the repeated /ci/, which is wrong.

Pin the kas container to 3.2 for now until this is resolved.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ec0bd0..c7a9191 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ghcr.io/siemens/kas/kas:latest-release
+image: ghcr.io/siemens/kas/kas:3.2
 
 variables:
   CPU_REQUEST: ""
-- 
2.25.1

[meta-zephyr][PATCH 2/2] zephyr-bsp/v2m-beetle: add support

[Jon Mason]

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml                               |  3 +++
 ci/v2m-beetle.yml                            |  6 ++++++
 meta-zephyr-bsp/conf/machine/v2m-beetle.conf | 12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 ci/v2m-beetle.yml
 create mode 100644 meta-zephyr-bsp/conf/machine/v2m-beetle.conf

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7a9191..d5462a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,6 +161,9 @@ qemu-x86:
 stm32mp157c-dk2:
   extends: .build
 
+v2m-beetle:
+  extends: .build
+
 v2m-musca-b1:
   extends: .build
 
diff --git a/ci/v2m-beetle.yml b/ci/v2m-beetle.yml
new file mode 100644
index 0000000..df62469
--- /dev/null
+++ b/ci/v2m-beetle.yml
@@ -0,0 +1,6 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+
+machine: v2m-beetle
diff --git a/meta-zephyr-bsp/conf/machine/v2m-beetle.conf b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf
new file mode 100644
index 0000000..37895c6
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf
@@ -0,0 +1,12 @@
+# Configuration for Beetle development board
+
+#@TYPE: Machine
+#@NAME: Beetle machine
+#@DESCRIPTION: Machine configuration for Beetle
+
+require conf/machine/include/arm/armv7m/tune-cortexm3.inc
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "newlib"
+
+ARCH:beetle = "arm"
-- 
2.25.1