This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 292f90e6b764d89147e5fd0ddef33eef31153f99
Author: Yanfeng Liu <[email protected]>
AuthorDate: Mon Feb 17 15:43:58 2025 +0800

    arch/armv8-r: fix SINGLE_SECURITY_STATE
    
    This fixes missing SINGLE_SECURITY_STATE in arm_gicv3.c with
    !ARCH_HAVE_TRUSTZONE per internal review discussions.
    
    Signed-off-by: Yanfeng Liu <[email protected]>
---
 arch/arm/Kconfig                 | 1 -
 arch/arm/src/armv8-r/arm_gicv3.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5041ebf1806..2ca51350f56 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1401,7 +1401,6 @@ config ARCH_ARMV8R
        select ALARM_ARCH
        select ARM_HAVE_WFE_SEV
 
-
 config ARM_GIC_VERSION
        int "GIC version"
        default 3 if ARCH_ARMV8R
diff --git a/arch/arm/src/armv8-r/arm_gicv3.c b/arch/arm/src/armv8-r/arm_gicv3.c
index b6caf8be4e1..46a91648f10 100644
--- a/arch/arm/src/armv8-r/arm_gicv3.c
+++ b/arch/arm/src/armv8-r/arm_gicv3.c
@@ -567,7 +567,7 @@ static void gicv3_dist_init(void)
   putreg32(0, GICD_CTLR);
   gic_wait_rwp(GIC_SPI_INT_BASE);
 
-#ifdef CONFIG_ARCH_SINGLE_SECURITY_STATE
+#ifndef CONFIG_ARCH_HAVE_TRUSTZONE
 
   /* Before configuration, we need to check whether
    * the GIC single security state mode is supported.
@@ -636,7 +636,7 @@ static void gicv3_dist_init(void)
    * it has different GIC configure with standard arrch64 A or R core
    */
 
-#ifdef CONFIG_ARCH_SINGLE_SECURITY_STATE
+#ifndef CONFIG_ARCH_HAVE_TRUSTZONE
   /* For GIC single security state(ARMv8-R), the config means
    * the GIC is under single security state which has
    * only two groups:

Reply via email to