sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it clear that GIC support is GICv2

Browse Source
This commit is contained in:
Gregory Nutt 2016-03-14 10:50:54 -06:00
parent 41b3af52b7
commit dcc93a7a44
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/armv7-a/Kconfig
View File

@ -5,7 +5,7 @@
comment "ARMv7-A Configuration Options" comment "ARMv7-A Configuration Options"
config ARMV7A_HAVE_GIC config ARMV7A_HAVE_GICv2
bool bool
default n default n
---help--- ---help---

6
arch/arm/src/armv7-a/arm_gic.c → arch/arm/src/armv7-a/arm_gicv2.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/armv7-a/arm_gic.c * arch/arm/src/armv7-a/arm_gicv2.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -52,7 +52,7 @@
#include "up_internal.h" #include "up_internal.h"
#include "gic.h" #include "gic.h"
#ifdef CONFIG_ARMV7A_HAVE_GIC #ifdef CONFIG_ARMV7A_HAVE_GICv2
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -534,4 +534,4 @@ int arm_cpu_sgi(int sgi, unsigned int cpuset)
return OK; return OK;
} }
#endif /* CONFIG_ARMV7A_HAVE_GIC */ #endif /* CONFIG_ARMV7A_HAVE_GICv2 */

6
arch/arm/src/armv7-a/gic.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/armv7-a/gic.h * arch/arm/src/armv7-a/gic.h
* Generic Interrupt Controller Definitions * Generic Interrupt Controller Version 2 Definitions
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -52,7 +52,7 @@
#include <stdint.h> #include <stdint.h>
#include "mpcore.h" #include "mpcore.h"
#ifdef CONFIG_ARMV7A_HAVE_GIC #ifdef CONFIG_ARMV7A_HAVE_GICv2
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -631,5 +631,5 @@ int arm_pause_handler(int irq, FAR void *context);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* CONFIG_ARMV7A_HAVE_GIC */ #endif /* CONFIG_ARMV7A_HAVE_GICv2 */
#endif /* __ARCH_ARM_SRC_ARMV7_A_GIC_H */ #endif /* __ARCH_ARM_SRC_ARMV7_A_GIC_H */

6
arch/arm/src/imx6/Kconfig
View File

@ -20,21 +20,21 @@ config ARCH_CHIP_IMX6_6SOLO
config ARCH_CHIP_IMX6_6DUALLITE config ARCH_CHIP_IMX6_6DUALLITE
bool "i.MX 6DualLite" bool "i.MX 6DualLite"
select ARCH_HAVE_MULTICPU select ARCH_HAVE_MULTICPU
select ARMV7A_HAVE_GIC select ARMV7A_HAVE_GICv2
select ARMV7A_HAVE_GTM select ARMV7A_HAVE_GTM
select ARMV7A_HAVE_PTM select ARMV7A_HAVE_PTM
config ARCH_CHIP_IMX6_6DUAL config ARCH_CHIP_IMX6_6DUAL
bool "i.MX 6Dual" bool "i.MX 6Dual"
select ARCH_HAVE_MULTICPU select ARCH_HAVE_MULTICPU
select ARMV7A_HAVE_GIC select ARMV7A_HAVE_GICv2
select ARMV7A_HAVE_GTM select ARMV7A_HAVE_GTM
select ARMV7A_HAVE_PTM select ARMV7A_HAVE_PTM
config ARCH_CHIP_IMX6_6QUAD config ARCH_CHIP_IMX6_6QUAD
bool "i.MX 6Quad" bool "i.MX 6Quad"
select ARCH_HAVE_MULTICPU select ARCH_HAVE_MULTICPU
select ARMV7A_HAVE_GIC select ARMV7A_HAVE_GICv2
select ARMV7A_HAVE_GTM select ARMV7A_HAVE_GTM
select ARMV7A_HAVE_PTM select ARMV7A_HAVE_PTM

2
arch/arm/src/imx6/Make.defs
View File

@ -71,7 +71,7 @@ CMN_CSRCS += up_puts.c up_mdelay.c up_stackframe.c up_udelay.c
CMN_CSRCS += up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c CMN_CSRCS += up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c
CMN_CSRCS += arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_dataabort.c CMN_CSRCS += arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_dataabort.c
CMN_CSRCS += arm_doirq.c arm_gic.c arm_initialstate.c arm_mmu.c CMN_CSRCS += arm_doirq.c arm_gicv2.c arm_initialstate.c arm_mmu.c
CMN_CSRCS += arm_prefetchabort.c arm_releasepending.c arm_reprioritizertr.c CMN_CSRCS += arm_prefetchabort.c arm_releasepending.c arm_reprioritizertr.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
CMN_CSRCS += arm_unblocktask.c arm_undefinedinsn.c CMN_CSRCS += arm_unblocktask.c arm_undefinedinsn.c