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 788c3d96303fcf0211029050c17fa8690af71387 Author: Yanfeng Liu <[email protected]> AuthorDate: Mon Feb 24 11:38:50 2025 +0800 arch/armv8-r: drop ARMV8R_HAVE_GICv3 This drops ARMV8R_HAVE_GICv3 as using ARM_GIC_VERSION is more easier, especially when multi GIC versions are used. Signed-off-by: Yanfeng Liu <[email protected]> --- arch/arm/Kconfig | 1 + arch/arm/src/armv8-r/Kconfig | 21 +++++---------------- arch/arm/src/fvp-v8r-aarch32/Kconfig | 2 +- arch/arm/src/qemu/Kconfig | 1 + 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2ca51350f56..20f10fb66dd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1406,6 +1406,7 @@ config ARM_GIC_VERSION default 3 if ARCH_ARMV8R default 2 range 2 4 + depends on ARCH_ARMV7A || ARCH_ARMV7R || ARCH_ARMV8R ---help--- Version of Generic Interrupt Controller (GIC) supported. diff --git a/arch/arm/src/armv8-r/Kconfig b/arch/arm/src/armv8-r/Kconfig index bebcb8f5588..f7cff2c32b0 100644 --- a/arch/arm/src/armv8-r/Kconfig +++ b/arch/arm/src/armv8-r/Kconfig @@ -26,30 +26,19 @@ comment "ARMv8-R Configuration Options" -config ARMV8R_HAVE_GICv3 - bool "ARMV8R_GICv3 support" - select ARCH_HAVE_IRQTRIGGER - default y - ---help--- - Selected by the configuration tool if the architecture supports the - Generic Interrupt Controller (GIC) - -if ARMV8R_HAVE_GICv3 - config ARMV8R_GIC_EOIMODE bool default n ---help--- - Enable GICC_CTLR.EOImode, this will separates the priority drop and interrupt - deactivation operations. + Enable GICC_CTLR.EOImode, this separates priority drop + and interrupt deactivation operations. config ARMV8R_GIC_SPI_EDGE - bool "Configure all SPIs(Shared Peripheral Interrupts) as edge-triggered by default" + bool "Configure all SPIs as edge-triggered" default n ---help--- - Configure all SPIs(Shared Peripheral Interrupts) as edge-triggered by default. - -endif # ARMV8R_HAVE_GICv3 + Configure all SPIs (Shared Peripheral Interrupts) as + edge-triggered by default. config ARMV8R_MEMINIT bool diff --git a/arch/arm/src/fvp-v8r-aarch32/Kconfig b/arch/arm/src/fvp-v8r-aarch32/Kconfig index 0a2d37d239e..fbe35dcba02 100644 --- a/arch/arm/src/fvp-v8r-aarch32/Kconfig +++ b/arch/arm/src/fvp-v8r-aarch32/Kconfig @@ -34,7 +34,7 @@ choice config ARCH_CHIP_FVP_R52 bool "FVP virtual Processor (Cortex-r52)" - select ARMV8R_HAVE_GICv3 + select ARCH_HAVE_IRQTRIGGER endchoice # FVP Chip Selection diff --git a/arch/arm/src/qemu/Kconfig b/arch/arm/src/qemu/Kconfig index 97e22cf1816..c4f0753fb45 100644 --- a/arch/arm/src/qemu/Kconfig +++ b/arch/arm/src/qemu/Kconfig @@ -60,6 +60,7 @@ config ARCH_CHIP_QEMU_CORTEXR52 select ARCH_CORTEXR52 select ARCH_HAVE_FETCHADD select ARCH_HAVE_FPU + select ARCH_HAVE_IRQTRIGGER select ARCH_HAVE_LOWVECTORS select ARCH_HAVE_MULTICPU select ARMV8R_HAVE_DECODEFIQ
