From 06dcc43b34378fd561a1846b1a083d32e2db6cb8 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Wed, 14 Aug 2024 09:50:06 +0200 Subject: [PATCH 1/2] platforms: disable zynqmp hyp 32 The zynqmp hyp + 32 combination needs more setup, it currently does not boot. Signed-off-by: Gerwin Klein --- seL4-platforms/platforms.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seL4-platforms/platforms.yml b/seL4-platforms/platforms.yml index 19b179fb..645a4c32 100644 --- a/seL4-platforms/platforms.yml +++ b/seL4-platforms/platforms.yml @@ -237,7 +237,7 @@ platforms: arch: arm modes: [32, 64] smp: [64] - aarch_hyp: [32, 64] + aarch_hyp: [64] platform: zynqmp req: [zcu102_2] march: armv8a @@ -250,7 +250,7 @@ platforms: arch: arm modes: [32, 64] smp: [64] - aarch_hyp: [32, 64] + aarch_hyp: [64] platform: zynqmp req: [zcu106] march: armv8a From 5a4376d57943d15ea8b5af4d9e2fd69b46a6e638 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Wed, 14 Aug 2024 09:53:07 +0200 Subject: [PATCH 2/2] sel4test-hw: disable zynqmp 32 mcs 32-bit zynqmp builds stop with assertion failure at boot on zcu102. Signed-off-by: Gerwin Klein --- sel4test-hw/build.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sel4test-hw/build.py b/sel4test-hw/build.py index edfd873e..9e1a60eb 100644 --- a/sel4test-hw/build.py +++ b/sel4test-hw/build.py @@ -85,6 +85,10 @@ def build_filter(build: Build) -> bool: build.is_hyp() and build.is_smp() and build.is_clang(): return False + # zynqmp 32 does not work with MCS + if plat.name == 'ZYNQMP' and build.get_mode() == 32 and build.is_mcs(): + return False + if plat.arch == 'x86': # Bamboo config says no VTX for SMP or verification if build.is_hyp() and (build.is_smp() or build.is_verification()):