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

libc/machine/arm: Use the correct arch Kconfig for variant check

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-11-26 19:59:11 +08:00 committed by Alan Carvalho de Assis
parent baabe5e08a
commit edca49fb5f
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/libc/machine/arm/Kconfig
View File

@ -3,26 +3,27 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_ARM7TDMI || ARCH_ARM920T || ARCH_ARM926EJS
if ARCH_ARM7TDMI || ARCH_ARM920T || ARCH_ARM926EJS || \
ARCH_ARM1136J || ARCH_ARM1156T2 || ARCH_ARM1176JZ
source libs/libc/machine/arm/arm/Kconfig
endif
if ARCH_CORTEXA5 || ARCH_CORTEXA8 || ARCH_CORTEXA9
if ARCH_ARMV7A
source libs/libc/machine/arm/armv7-a/Kconfig
endif
if ARCH_CORTEXR4 || ARCH_CORTEXR5 || ARCH_CORTEXR7
if ARCH_ARMV7R
source libs/libc/machine/arm/armv7-r/Kconfig
endif
if ARCH_CORTEXM0
if ARCH_ARMV6M
source libs/libc/machine/arm/armv6-m/Kconfig
endif
if ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7
if ARCH_ARMV7M
source libs/libc/machine/arm/armv7-m/Kconfig
endif
if ARCH_CORTEXM33
if ARCH_ARMV8M
source libs/libc/machine/arm/armv8/Kconfig
endif

12
libs/libc/machine/arm/Make.defs
View File

@ -37,17 +37,23 @@ ifeq ($(CONFIG_ARCH_ARM7TDMI),y) # ARM7TDMI is ARMv4T
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARM920T),y) # ARM920T is ARMv4T
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARM926EJS),y) # ARM926EJS is ARMv5TE
else ifeq ($(CONFIG_ARCH_ARM926EJS),y) # ARM926EJS is ARMv5TEJ
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARM1136J),y) # ARM1136J is ARMv6
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARM1156T2),y) # ARM1156T2 is ARMv6T2
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARM1176JZ),y) # ARM1176JZ is ARMv6Z
include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
else ifeq ($(CONFIG_ARCH_ARMV7A),y) # All ARMv7-A
include $(TOPDIR)/libs/libc/machine/arm/armv7-a/Make.defs
else ifeq ($(CONFIG_ARCH_ARMV7R),y) # All ARMv7-R
include $(TOPDIR)/libs/libc/machine/arm/armv7-r/Make.defs
else ifeq ($(CONFIG_ARCH_CORTEXM0),y) # Cortex-M0 is ARMv6-M
else ifeq ($(CONFIG_ARCH_ARMV6M),y) # All ARMv6-M
include $(TOPDIR)/libs/libc/machine/arm/armv6-m/Make.defs
else ifeq ($(CONFIG_ARCH_ARMV7M),y) # All ARMv7-M
include $(TOPDIR)/libs/libc/machine/arm/armv7-m/Make.defs
else ifeq ($(CONFIG_ARCH_CORTEXM33),y) # Cortex-M33 is ARMv8-M
else ifeq ($(CONFIG_ARCH_ARMV8M),y) # All ARMv8-M
include $(TOPDIR)/libs/libc/machine/arm/armv8/Make.defs
endif

2
libs/libc/machine/arm/armv8/Kconfig
View File

@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CORTEXM33
if ARCH_ARMV8M
config ARMV8_LIBM
bool "Architecture specific optimizations"