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

Add hooks to select Cortex-A8

Browse Source
This commit is contained in:
Gregory Nutt 2013-08-27 08:46:37 -06:00
parent f69688422f
commit a55dda98b3
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/Kconfig
View File

@ -178,11 +178,17 @@ config ARCH_CORTEXA5
select ARCH_IRQPRIO select ARCH_IRQPRIO
select ARCH_HAVE_MMU select ARCH_HAVE_MMU
config ARCH_CORTEXA8
bool
default n
select ARCH_IRQPRIO
select ARCH_HAVE_MMU
config ARCH_FAMILY config ARCH_FAMILY
string string
default "arm" if ARCH_ARM7TDMI || ARCH_ARM926EJS || ARCH_ARM920T default "arm" if ARCH_ARM7TDMI || ARCH_ARM926EJS || ARCH_ARM920T
default "armv6-m" if ARCH_CORTEXM0 default "armv6-m" if ARCH_CORTEXM0
default "armv7-a" if ARCH_CORTEXA5 default "armv7-a" if ARCH_CORTEXA5 || ARCH_CORTEXA8
default "armv7-m" if ARCH_CORTEXM3 || ARCH_CORTEXM4 default "armv7-m" if ARCH_CORTEXM3 || ARCH_CORTEXM4
config ARCH_CHIP config ARCH_CHIP
@ -305,7 +311,7 @@ config DEBUG_HARDFAULT
if ARCH_CORTEXM0 if ARCH_CORTEXM0
source arch/arm/src/armv6-m/Kconfig source arch/arm/src/armv6-m/Kconfig
endif endif
if ARCH_CORTEXA5 if ARCH_CORTEXA5 || ARCH_CORTEXA8
source arch/arm/src/armv7-a/Kconfig source arch/arm/src/armv7-a/Kconfig
endif endif
if ARCH_CORTEXM3 || ARCH_CORTEXM4 if ARCH_CORTEXM3 || ARCH_CORTEXM4

2
arch/arm/include/irq.h
View File

@ -56,7 +56,7 @@
* save structure and irqsave()/irqrestore() macros) * save structure and irqsave()/irqrestore() macros)
*/ */
#if defined(CONFIG_ARCH_CORTEXA5) #if defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)
# include <arch/armv7-a/irq.h> # include <arch/armv7-a/irq.h>
#elif defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) #elif defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4)
# include <arch/armv7-m/irq.h> # include <arch/armv7-m/irq.h>

6
arch/arm/src/Makefile
View File

@ -36,7 +36,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include chip/Make.defs -include chip/Make.defs
ifeq ($(CONFIG_ARCH_CORTEXA5),y) # Cortex-A5 is ARMv7 ifeq ($(CONFIG_ARCH_CORTEXA5),y) # Cortex-A5 is ARMv7-A
ARCH_SUBDIR = armv7-a
else
ifeq ($(CONFIG_ARCH_CORTEXA8),y) # Cortex-A8 is ARMv7-A
ARCH_SUBDIR = armv7-a ARCH_SUBDIR = armv7-a
else else
ifeq ($(CONFIG_ARCH_CORTEXM3),y) # Cortex-M3 is ARMv7-M ifeq ($(CONFIG_ARCH_CORTEXM3),y) # Cortex-M3 is ARMv7-M
@ -53,6 +56,7 @@ endif
endif endif
endif endif
endif endif
endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src

4
arch/arm/src/common/up_internal.h
View File

@ -138,7 +138,7 @@
* register save/restore. * register save/restore.
*/ */
#elif defined(CONFIG_ARCH_CORTEXA5) #elif defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)
/* If the floating point unit is present and enabled, then save the /* If the floating point unit is present and enabled, then save the
* floating point registers as well as normal ARM registers. * floating point registers as well as normal ARM registers.
@ -330,7 +330,7 @@ int up_memfault(int irq, FAR void *context);
* back-ported to the ARM7 and ARM9 families). * back-ported to the ARM7 and ARM9 families).
*/ */
#elif defined(CONFIG_ARCH_CORTEXA5) #elif defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)
/* Interrupt dispatch */ /* Interrupt dispatch */