diff --git a/boards/arm/mps4/mps4_corstone320_fvp.yaml b/boards/arm/mps4/mps4_corstone320_fvp.yaml index 624c8580812..9549fdd43b0 100644 --- a/boards/arm/mps4/mps4_corstone320_fvp.yaml +++ b/boards/arm/mps4/mps4_corstone320_fvp.yaml @@ -17,6 +17,7 @@ supported: - gpio testing: default: true + timeout_multiplier: 4 ignore_tags: - drivers - bluetooth diff --git a/tests/application_development/vector_table_relocation/testcase.yaml b/tests/application_development/vector_table_relocation/testcase.yaml index 401dd9ad21c..fd4b2fb7505 100644 --- a/tests/application_development/vector_table_relocation/testcase.yaml +++ b/tests/application_development/vector_table_relocation/testcase.yaml @@ -9,3 +9,4 @@ tests: platform_exclude: - mps3/corstone310/an555 - mps3/corstone310/fvp + - mps4/corstone320/fvp diff --git a/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt b/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt index 4eb11b09f20..c30e5b30c52 100644 --- a/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt +++ b/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt @@ -8,3 +8,4 @@ project(arm_mpu_pxn) target_sources(app PRIVATE src/main.c) zephyr_linker_sources_ifdef(CONFIG_SOC_MPS3_CORSTONE300 RAM_SECTIONS mps3_corstone300.ld) zephyr_linker_sources_ifdef(CONFIG_SOC_MPS3_CORSTONE310 RAM_SECTIONS mps3_corstone310.ld) +zephyr_linker_sources_ifdef(CONFIG_SOC_MPS4_CORSTONE320 RAM_SECTIONS mps4_corstone320.ld) diff --git a/tests/arch/arm/arm_mpu_pxn/mps4_corstone320.ld b/tests/arch/arm/arm_mpu_pxn/mps4_corstone320.ld new file mode 100644 index 00000000000..945f0f0cc6f --- /dev/null +++ b/tests/arch/arm/arm_mpu_pxn/mps4_corstone320.ld @@ -0,0 +1,11 @@ +/* + * Copyright 2025 Arm Limited and/or its affiliates + * + * SPDX-License-Identifier: Apache-2.0 + */ + +SECTION_DATA_PROLOGUE(.customramfunc, , ) +{ + *(.customramfunc) * (".customramfunc.*") +} +GROUP_DATA_LINK_IN(DTCM, DTCM) diff --git a/tests/arch/arm/arm_mpu_pxn/mps4_corstone320_fvp.overlay b/tests/arch/arm/arm_mpu_pxn/mps4_corstone320_fvp.overlay new file mode 100644 index 00000000000..cb51331990f --- /dev/null +++ b/tests/arch/arm/arm_mpu_pxn/mps4_corstone320_fvp.overlay @@ -0,0 +1,18 @@ +/* + * Copyright 2025 Arm Limited and/or its affiliates + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + + +/ { + dtcm: dtcm@30000000 { + compatible = "zephyr,memory-region"; + reg = <0x30000000 DT_SIZE_K(32)>; + zephyr,memory-region = "DTCM"; + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_PXN) )>; + }; +}; diff --git a/tests/arch/arm/arm_mpu_pxn/testcase.yaml b/tests/arch/arm/arm_mpu_pxn/testcase.yaml index c6b11b32160..54ba46383c4 100644 --- a/tests/arch/arm/arm_mpu_pxn/testcase.yaml +++ b/tests/arch/arm/arm_mpu_pxn/testcase.yaml @@ -7,6 +7,7 @@ common: - mps3/corstone300/an547 - mps3/corstone300/fvp - mps3/corstone310/fvp + - mps4/corstone320/fvp tests: # To verify that region marked with PXN attribute can be executed from unprivileged code # and cannot be executed from privileged code