From fa07bd94198fb6607a20c49e1530a8fea6184ad5 Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Fri, 9 Feb 2024 13:29:11 +0100 Subject: [PATCH] boards: mps3: Fix non-secure variant Both TRUSTED_EXECUTION_SECURE and TRUSTED_EXECUTION_NONSECURE were being enabled, through a combination of multiple defconfigs. Signed-off-by: Grzegorz Swiderski --- boards/arm/mps3/mps3_an547_ns_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boards/arm/mps3/mps3_an547_ns_defconfig b/boards/arm/mps3/mps3_an547_ns_defconfig index dcf5a170340..ccc25c35019 100644 --- a/boards/arm/mps3/mps3_an547_ns_defconfig +++ b/boards/arm/mps3/mps3_an547_ns_defconfig @@ -6,7 +6,6 @@ CONFIG_ARM_TRUSTZONE_M=y CONFIG_RUNTIME_NMI=y -CONFIG_TRUSTED_EXECUTION_NONSECURE=y CONFIG_ARM_MPU=y CONFIG_QEMU_ICOUNT_SHIFT=6 @@ -17,3 +16,7 @@ CONFIG_GPIO=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y + +# Build a Non-secure firmware image +CONFIG_TRUSTED_EXECUTION_SECURE=n +CONFIG_TRUSTED_EXECUTION_NONSECURE=y