zephyrproject-rtos · galak · Apr 26, 2019 · Apr 4, 2019 · Apr 4, 2019 · Apr 5, 2019
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,6 +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_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/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig
@@ -3,6 +3,8 @@
 CONFIG_ARM=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F401XE=y
+CONFIG_CORTEX_M_SYSTICK=y
+
 # 84MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig b/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_96B_STM32_SENSOR_MEZ=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F446XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 
 # 84MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000

diff --git a/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig b/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig
@@ -3,6 +3,7 @@ CONFIG_BOARD_MIKROE_MINI_M4_FOR_STM32=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F415RG=y
 # 168MHz system clock
+CONFIG_CORTEX_M_SYSTICK=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 

diff --git a/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig b/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F207ZG=y
 CONFIG_SOC_SERIES_STM32F2X=y
 CONFIG_SOC_STM32F207XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 

diff --git a/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig b/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig
@@ -3,6 +3,7 @@
 CONFIG_ARM=y
 CONFIG_SOC_SERIES_STM32F3X=y
 CONFIG_SOC_STM32F302X8=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 72 MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F401RE=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F401XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 84MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F411RE=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F411XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 96MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F412ZG=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F412ZG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 96MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F413ZH=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F413XX=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 96MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig b/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig
@@ -3,6 +3,7 @@
 CONFIG_ARM=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F429XI=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F446RE=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F446XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 96MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig b/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F746ZG=y
 CONFIG_SOC_SERIES_STM32F7X=y
 CONFIG_SOC_STM32F746XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 72MHz system clock (CubeMX Defaults)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig b/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F756ZG=y
 CONFIG_SOC_SERIES_STM32F7X=y
 CONFIG_SOC_STM32F756XX=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 72MHz system clock (CubeMX Defaults)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_OLIMEX_STM32_E407=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F407XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_OLIMEX_STM32_H407=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F407XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_OLIMEX_STM32_P405=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F405XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f3_disco/stm32f3_disco_defconfig b/boards/arm/stm32f3_disco/stm32f3_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F3_DISCO=y
 CONFIG_SOC_SERIES_STM32F3X=y
 CONFIG_SOC_STM32F303XC=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 72MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F411E_DISCO=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F411XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 100MHz system clock (highest value to get a precise USB clock should be 96MHz)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F412G_DISCO=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F412ZG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 100MHz system clock (highest value to get a precise USB clock should be 96MHz)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F429I_DISC1=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F429XI=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F469I_DISCO=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F469XI=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 180MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=180000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F4_DISCO=y
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F407XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig b/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F723E_DISCO=y
 CONFIG_SOC_SERIES_STM32F7X=y
 CONFIG_SOC_STM32F723XE=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 216MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=216000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig b/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F746G_DISCO=y
 CONFIG_SOC_SERIES_STM32F7X=y
 CONFIG_SOC_STM32F746XG=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 216MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=216000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig b/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_BOARD_STM32F769I_DISCO=y
 CONFIG_SOC_SERIES_STM32F7X=y
 CONFIG_SOC_STM32F769XI=y
+CONFIG_CORTEX_M_SYSTICK=y
 # 216MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=216000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
@@ -91,8 +91,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
@@ -110,7 +109,6 @@ config ALTERA_AVALON_TIMER
 
 config NRF_RTC_TIMER
 	bool "nRF Real Time Counter (NRF_RTC1) Timer"
-	default y
 	depends on CLOCK_CONTROL
 	depends on SOC_COMPATIBLE_NRF
 	select TICKLESS_CAPABLE

diff --git a/soc/arm/arm/beetle/Kconfig.series b/soc/arm/arm/beetle/Kconfig.series
@@ -11,7 +11,6 @@ config SOC_SERIES_BEETLE
 	depends on ARM
 	select CPU_CORTEX_M3
 	select SOC_FAMILY_ARM
-	select CPU_HAS_SYSTICK
 	select CPU_HAS_ARM_MPU
 	help
 	 Enable support for Beetle MCU Series
diff --git a/soc/arm/arm/mps2/Kconfig.series b/soc/arm/arm/mps2/Kconfig.series
@@ -8,7 +8,6 @@ config SOC_SERIES_MPS2
 	bool "ARM MPS2 MCU Series"
 	depends on ARM
 	select SOC_FAMILY_ARM
-	select CPU_HAS_SYSTICK
 	select GPIO_MMIO32 if GPIO
 	help
 	  Enable support for ARM MPS2 MCU Series
diff --git a/soc/arm/arm/musca_a/Kconfig.series b/soc/arm/arm/musca_a/Kconfig.series
@@ -7,7 +7,6 @@
 config SOC_SERIES_MUSCA
 	bool "ARM v2m MUSCA MCU Series"
 	select SOC_FAMILY_ARM
-	select CPU_HAS_SYSTICK
 	select BUILD_OUTPUT_HEX
 	help
 	  Enable support for ARM MPS2 MCU Series
diff --git a/soc/arm/arm/musca_b1/Kconfig.series b/soc/arm/arm/musca_b1/Kconfig.series
@@ -7,7 +7,6 @@
 config SOC_SERIES_MUSCA_B1
 	bool "arm v2m MUSCA B1 MCU Series"
 	select SOC_FAMILY_ARM
-	select CPU_HAS_SYSTICK
 	select BUILD_OUTPUT_HEX
 	help
 	  Enable support for arm V2M Musca B1 MCU Series
diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.series b/soc/arm/atmel_sam/sam3x/Kconfig.series
@@ -10,7 +10,6 @@ config SOC_SERIES_SAM3X
 	bool "Atmel SAM3X MCU"
 	select CPU_CORTEX_M3
 	select SOC_FAMILY_SAM
-	select CPU_HAS_SYSTICK
 	select CPU_HAS_ARM_MPU
 	select ASF
 	help

diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.series b/soc/arm/atmel_sam/sam4s/Kconfig.series
@@ -10,7 +10,6 @@ config SOC_SERIES_SAM4S
 	bool "Atmel SAM4S MCU"
 	select CPU_CORTEX_M4
 	select SOC_FAMILY_SAM
-	select CPU_HAS_SYSTICK
 	select ASF
 	help
 	  Enable support for Atmel SAM4S Cortex-M4 microcontrollers.

diff --git a/soc/arm/atmel_sam/same70/Kconfig.series b/soc/arm/atmel_sam/same70/Kconfig.series
@@ -9,7 +9,6 @@ config SOC_SERIES_SAME70
 	select CPU_CORTEX_M7
 	select SOC_FAMILY_SAM
 	select CPU_HAS_FPU_DOUBLE_PRECISION
-	select CPU_HAS_SYSTICK
 	select ASF
 	select XIP
 	select CPU_HAS_ARM_MPU

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/microchip_mec/mec1701/Kconfig.series b/soc/arm/microchip_mec/mec1701/Kconfig.series
@@ -7,10 +7,8 @@
 
 config SOC_SERIES_MEC1701X
 	bool "Microchip MEC1701X Series"
-	select CPU_CORTEX_M
 	select CPU_CORTEX_M4
 	select SOC_FAMILY_MEC
-	select CPU_HAS_SYSTICK
 	select CPU_HAS_FPU
 	help
 	  Enable support for Microchip MEC Cortex-M4 MCU series
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series
@@ -7,12 +7,10 @@
 
 config SOC_SERIES_IMX_6X_M4
 	bool "i.MX 6SoloX M4 Core Series"
-	select CPU_CORTEX_M
 	select CPU_CORTEX_M4
 	select HAS_IMX_HAL
 	select SOC_FAMILY_IMX
 	select CPU_HAS_FPU
-	select CPU_HAS_SYSTICK
 	select CLOCK_CONTROL
 	help
 	  Enable support for M4 core of i.MX 6SoloX MCU series
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series
@@ -7,10 +7,8 @@
 
 config SOC_SERIES_IMX7_M4
 	bool "i.MX7 M4 Core Series"
-	select CPU_CORTEX_M
 	select CPU_CORTEX_M4
 	select SOC_FAMILY_IMX
-	select CPU_HAS_SYSTICK
 	select CLOCK_CONTROL
 	select CPU_HAS_FPU
 	help

diff --git a/soc/arm/nxp_imx/rt/Kconfig.series b/soc/arm/nxp_imx/rt/Kconfig.series
@@ -9,7 +9,6 @@ config SOC_SERIES_IMX_RT
 	bool "i.MX RT Series"
 	select CPU_CORTEX_M7
 	select SOC_FAMILY_IMX
-	select CPU_HAS_SYSTICK
 	select CLOCK_CONTROL
 	help
 	  Enable support for i.MX RT MCU series
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.series b/soc/arm/nxp_kinetis/k6x/Kconfig.series
@@ -9,7 +9,6 @@ config SOC_SERIES_KINETIS_K6X
 	bool "Kinetis K6x Series MCU"
 	select CPU_CORTEX_M4
 	select SOC_FAMILY_KINETIS
-	select CPU_HAS_SYSTICK
 	select CPU_HAS_NXP_MPU
 	select CLOCK_CONTROL
 	help

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