soc: arm: rename CPU_HAS_SYSTICK to CPU_CORTEX_M_HAS_SYSTICK

ioannisg · galak · commit 894eca5e4f70 · 2019-04-25T23:09:23.000-07:00
This commit renames the symbol CPU_HAS_SYSTICK to
CPU_CORTEX_M_HAS_SYSTICK, to look similar to all
other CPU_CORTEX_M_HAS_ options, and moves the
K-config symbol definition from arm/core/Kconfig to
arm/core/cortex_m/Kconfig.

Signed-off-by: Ioannis Glaropoulos &lt;Ioannis.Glaropoulos@nordicsemi.no&gt;
diff --git a/arch/arm/core/Kconfig b/arch/arm/core/Kconfig
@@ -28,12 +28,6 @@ config CPU_CORTEX_M
 	help
 	  This option signifies the use of a CPU of the Cortex-M family.
 
-config CPU_HAS_SYSTICK
-	bool
-	# Omit prompt to signify "hidden" option
-	help
-	  This option is enabled when the CPU has systick timer implemented.
-
 config BUILTIN_STACK_GUARD
 	bool "Thread Stack Guards based on built-in ARM stack limit checking"
 	depends on CPU_CORTEX_M_HAS_SPLIM
diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig
@@ -103,6 +103,12 @@ config ISA_THUMB2
 	  technology is featured in the  processor, and in all ARMv7
 	  architecture-based processors.
 
+config CPU_CORTEX_M_HAS_SYSTICK
+	bool
+	# Omit prompt to signify "hidden" option
+	help
+	  This option is enabled when the CPU implements the SysTick timer.
+
 config CPU_CORTEX_M_HAS_BASEPRI
 	bool
 	# Omit prompt to signify "hidden" option
@@ -207,7 +213,7 @@ config ARMV7_M_ARMV8_M_MAINLINE
 	select CPU_CORTEX_M_HAS_BASEPRI
 	select CPU_CORTEX_M_HAS_VTOR
 	select CPU_CORTEX_M_HAS_PROGRAMMABLE_FAULT_PRIOS
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	help
 	  This option signifies the use of an ARMv7-M processor
 	  implementation, or the use of a backwards-compatible
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
@@ -92,7 +92,7 @@ config ARCV2_TIMER_IRQ_PRIORITY
 config CORTEX_M_SYSTICK
 	bool "Cortex-M SYSTICK timer"
 	default y
-	depends on CPU_HAS_SYSTICK
+	depends on CPU_CORTEX_M_HAS_SYSTICK
 	select TICKLESS_CAPABLE
 	help
 	  This module implements a kernel device driver for the Cortex-M processor
diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.series b/soc/arm/atmel_sam0/samd20/Kconfig.series
@@ -7,7 +7,7 @@ config SOC_SERIES_SAMD20
 	bool "Atmel SAMD20 MCU"
 	select CPU_CORTEX_M0PLUS
 	select SOC_FAMILY_SAM0
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_VTOR
 	select ASF
 	help
diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.series b/soc/arm/atmel_sam0/samd21/Kconfig.series
@@ -7,7 +7,7 @@ config SOC_SERIES_SAMD21
 	bool "Atmel SAMD21 MCU"
 	select CPU_CORTEX_M0PLUS
 	select SOC_FAMILY_SAM0
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_VTOR
 	select ASF
 	help
diff --git a/soc/arm/cypress/psoc6/Kconfig.series b/soc/arm/cypress/psoc6/Kconfig.series
@@ -8,7 +8,7 @@
 config SOC_SERIES_PSOC62
 	bool "Cypress PSoC6 series MCU"
 	select SOC_FAMILY_PSOC6
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_CYPRESS_DRIVERS
 	select SOC_NOINIT_LD
 	select SOC_RWDATA_LD
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.series b/soc/arm/nxp_kinetis/kl2x/Kconfig.series
@@ -9,7 +9,7 @@ config SOC_SERIES_KINETIS_KL2X
 	bool "Kinetis KL2x Series MCU"
 	select CPU_CORTEX_M0PLUS
 	select SOC_FAMILY_KINETIS
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select CLOCK_CONTROL
 	help
 	 Enable support for Kinetis KL2x MCU series
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.series b/soc/arm/nxp_kinetis/kwx/Kconfig.series
@@ -8,7 +8,7 @@
 config SOC_SERIES_KINETIS_KWX
 	bool "Kinetis KWx Series MCU"
 	select SOC_FAMILY_KINETIS
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select CLOCK_CONTROL
 	help
 	  Enable support for Kinetis KWx MCU series
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series
@@ -9,6 +9,6 @@ config SOC_SERIES_LPC54XXX
 	bool "LPC LPC54xxx Series MCU"
 	select HAS_MCUX
 	select SOC_FAMILY_LPC
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	help
 	  Enable support for LPC LPC54XXX MCU series
diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.series b/soc/arm/silabs_exx32/efm32hg/Kconfig.series
@@ -9,7 +9,7 @@ config SOC_SERIES_EFM32HG
 	bool "EFM32HG Series MCU"
 	select CPU_CORTEX_M0PLUS
 	select SOC_FAMILY_EXX32
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_SILABS_GECKO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_GPIO
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.series b/soc/arm/st_stm32/stm32f0/Kconfig.series
@@ -10,7 +10,7 @@ config SOC_SERIES_STM32F0X
 	select CPU_CORTEX_M0
 	select CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP
 	select SOC_FAMILY_STM32
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_STM32CUBE
 	select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL
 	help
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.series b/soc/arm/st_stm32/stm32l0/Kconfig.series
@@ -11,7 +11,7 @@ config SOC_SERIES_STM32L0X
 	select CPU_CORTEX_M_HAS_VTOR
 	select SOC_FAMILY_STM32
 	select HAS_STM32CUBE
-	select CPU_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_SYSTICK
 	select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL
 	help
 	  Enable support for STM32L0 MCU series
