michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename option CPU_CORTEXM3 to CPU_CORTEX_M3

Browse source 
Makes name more consistent with CPU_CORTEX_M3_M4 option.

Change-Id: I0b89a50a5c0b728167cd76219d25ddf98243c0dd
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-06-10 16:16:03 -04:00 • committed by Anas Nashif
commit a9941af3ee
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/bsp/CortexM/Kconfig
View file

@ -54,7 +54,7 @@ config CPU_CORTEX_M3_M4
help help
This option signifies the use of either a Cortex-M3 or Cortex-M4 CPU. This option signifies the use of either a Cortex-M3 or Cortex-M4 CPU.
config CPU_CORTEXM3 config CPU_CORTEX_M3
# omit prompt to signify a "hidden" option # omit prompt to signify a "hidden" option
bool "ARM Cortex-M3" bool "ARM Cortex-M3"
default n default n
@ -66,7 +66,7 @@ config CPU_CORTEXM4
# omit prompt to signify a "hidden" option # omit prompt to signify a "hidden" option
bool "ARM Cortex-M4" bool "ARM Cortex-M4"
default n default n
select CPU_CORTEXM3 select CPU_CORTEX_M3
help help
This option signifies the use of a Cortex-M4 CPU This option signifies the use of a Cortex-M4 CPU

2
arch/arm/bsp/Kconfig
View file

@ -43,7 +43,7 @@ config BSP_FSL_FRDM_K64F
config BSP_TI_LM3S6965 config BSP_TI_LM3S6965
bool "Minimum Configuration for a TI LM3S6965" bool "Minimum Configuration for a TI LM3S6965"
select CPU_CORTEXM3 select CPU_CORTEX_M3
select STELLARIS_UART select STELLARIS_UART
endchoice endchoice

2
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -85,7 +85,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
CONFIG_CPU_CORTEX=y CONFIG_CPU_CORTEX=y
CONFIG_CPU_CORTEXM=y CONFIG_CPU_CORTEXM=y
CONFIG_CPU_CORTEX_M3_M4=y CONFIG_CPU_CORTEX_M3_M4=y
CONFIG_CPU_CORTEXM3=y CONFIG_CPU_CORTEX_M3=y
CONFIG_CPU_CORTEXM4=y CONFIG_CPU_CORTEXM4=y
# #

2
arch/arm/configs/micro_ti_lm3s6965_defconfig
View file

@ -85,7 +85,7 @@ CONFIG_BSP_TI_LM3S6965=y
CONFIG_CPU_CORTEX=y CONFIG_CPU_CORTEX=y
CONFIG_CPU_CORTEXM=y CONFIG_CPU_CORTEXM=y
CONFIG_CPU_CORTEX_M3_M4=y CONFIG_CPU_CORTEX_M3_M4=y
CONFIG_CPU_CORTEXM3=y CONFIG_CPU_CORTEX_M3=y
# CONFIG_CPU_CORTEXM4 is not set # CONFIG_CPU_CORTEXM4 is not set
# #

2
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -64,7 +64,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
CONFIG_CPU_CORTEX=y CONFIG_CPU_CORTEX=y
CONFIG_CPU_CORTEXM=y CONFIG_CPU_CORTEXM=y
CONFIG_CPU_CORTEX_M3_M4=y CONFIG_CPU_CORTEX_M3_M4=y
CONFIG_CPU_CORTEXM3=y CONFIG_CPU_CORTEX_M3=y
CONFIG_CPU_CORTEXM4=y CONFIG_CPU_CORTEXM4=y
# #

2
arch/arm/configs/nano_ti_lm3s6965_defconfig
View file

@ -64,7 +64,7 @@ CONFIG_BSP_TI_LM3S6965=y
CONFIG_CPU_CORTEX=y CONFIG_CPU_CORTEX=y
CONFIG_CPU_CORTEXM=y CONFIG_CPU_CORTEXM=y
CONFIG_CPU_CORTEX_M3_M4=y CONFIG_CPU_CORTEX_M3_M4=y
CONFIG_CPU_CORTEXM3=y CONFIG_CPU_CORTEX_M3=y
# CONFIG_CPU_CORTEXM4 is not set # CONFIG_CPU_CORTEXM4 is not set
# #

2
arch/arm/defconfig
View file

@ -85,7 +85,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
CONFIG_CPU_CORTEX=y CONFIG_CPU_CORTEX=y
CONFIG_CPU_CORTEXM=y CONFIG_CPU_CORTEXM=y
CONFIG_CPU_CORTEX_M3_M4=y CONFIG_CPU_CORTEX_M3_M4=y
CONFIG_CPU_CORTEXM3=y CONFIG_CPU_CORTEX_M3=y
CONFIG_CPU_CORTEXM4=y CONFIG_CPU_CORTEXM4=y
# #

2
scripts/Makefile.arm.preparch
View file

@ -1,7 +1,7 @@
LTO_FLAG-y = $(call cc-option,-flto,) LTO_FLAG-y = $(call cc-option,-flto,)
SECTION_GC_FLAG = $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,) SECTION_GC_FLAG = $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
arm_FLAGS = $(call cc-option,-mthumb,) arm_FLAGS = $(call cc-option,-mthumb,)
ifeq ($(CONFIG_CPU_CORTEXM3),y) ifeq ($(CONFIG_CPU_CORTEX_M3),y)
arm_FLAGS += -mcpu=cortex-m3 -march=armv7-m arm_FLAGS += -mcpu=cortex-m3 -march=armv7-m
endif endif
ifeq ($(CONFIG_CPU_CORTEXM4),y) ifeq ($(CONFIG_CPU_CORTEXM4),y)