From 3583555b7db2b9e34ce3184cfa36a8cbb65151bc Mon Sep 17 00:00:00 2001 From: Matt Rossouw Date: Tue, 4 Feb 2025 16:20:46 +1100 Subject: [PATCH] Added flags for Cheshire platform (#129) Cheshire - no timer and 1GiB of RAM so timer and huge page tests must be disabled. Signed-off-by: Matt Rossouw --- apps/sel4test-tests/arch/riscv/arch_frame_type.h | 3 ++- settings.cmake | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/sel4test-tests/arch/riscv/arch_frame_type.h b/apps/sel4test-tests/arch/riscv/arch_frame_type.h index 9cdd4098..7f1c4115 100644 --- a/apps/sel4test-tests/arch/riscv/arch_frame_type.h +++ b/apps/sel4test-tests/arch/riscv/arch_frame_type.h @@ -15,7 +15,8 @@ static const frame_type_t frame_types[] = { * so we can't allocate a 1GiB page for this test. * Polarfire has 1GiB of memory can't allocate a 1GiB page for user space */ #if __riscv_xlen == 64 && !defined(CONFIG_PLAT_ROCKETCHIP) \ - && !defined(CONFIG_PLAT_ARIANE) &&!defined(CONFIG_PLAT_POLARFIRE) + && !defined(CONFIG_PLAT_ARIANE) &&!defined(CONFIG_PLAT_POLARFIRE) \ + && !defined(CONFIG_PLAT_CHESHIRE) { seL4_RISCV_Giga_Page, 0, seL4_HugePageBits, }, #endif { seL4_RISCV_Mega_Page, 0, seL4_LargePageBits, }, diff --git a/settings.cmake b/settings.cmake index b223b432..b0b980ad 100644 --- a/settings.cmake +++ b/settings.cmake @@ -82,6 +82,7 @@ if(NOT Sel4testAllowSettingsOverride) OR KernelPlatformQuartz64 OR KernelPlatformRocketchip OR KernelPlatformRocketchipZCU102 + OR KernelPlatformCheshire OR (SIMULATION AND (KernelArchRiscV OR KernelArchARM)) ) # Frequency settings of the ZynqMP make the ltimer tests problematic