From ccf90fd9c224d281aed75fd8a88b1437d262028c Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Thu, 4 Apr 2019 19:40:27 +0200 Subject: [PATCH] soc: arm: select CPU_HAS_SYSTICK in ARCH Kconfig ARM SysTick timer is implemented by default in ARMv7-M and Mainline ARMv8-M processors, so we include the corresponding Kconfig symbol in arch/arm/core/cortex-M/Kconfig and remove the selections from the Cortex-M SOCs. Signed-off-by: Ioannis Glaropoulos --- arch/arm/core/cortex_m/Kconfig | 1 + soc/arm/arm/beetle/Kconfig.series | 1 - soc/arm/arm/mps2/Kconfig.series | 1 - soc/arm/arm/musca_a/Kconfig.series | 1 - soc/arm/arm/musca_b1/Kconfig.series | 1 - soc/arm/atmel_sam/sam3x/Kconfig.series | 1 - soc/arm/atmel_sam/sam4s/Kconfig.series | 1 - soc/arm/atmel_sam/same70/Kconfig.series | 1 - soc/arm/microchip_mec/mec1701/Kconfig.series | 1 - soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series | 1 - soc/arm/nxp_imx/mcimx7_m4/Kconfig.series | 1 - soc/arm/nxp_imx/rt/Kconfig.series | 1 - soc/arm/nxp_kinetis/k6x/Kconfig.series | 1 - soc/arm/silabs_exx32/efm32pg12b/Kconfig.series | 1 - soc/arm/silabs_exx32/efm32wg/Kconfig.series | 1 - soc/arm/silabs_exx32/efr32fg1p/Kconfig.series | 1 - soc/arm/silabs_exx32/efr32mg12p/Kconfig.series | 1 - soc/arm/st_stm32/stm32f1/Kconfig.series | 1 - soc/arm/st_stm32/stm32f2/Kconfig.series | 1 - soc/arm/st_stm32/stm32f3/Kconfig.series | 1 - soc/arm/st_stm32/stm32f4/Kconfig.series | 1 - soc/arm/st_stm32/stm32f7/Kconfig.series | 1 - soc/arm/st_stm32/stm32l1/Kconfig.series | 1 - soc/arm/st_stm32/stm32l4/Kconfig.series | 1 - soc/arm/st_stm32/stm32mp1/Kconfig.series | 1 - soc/arm/st_stm32/stm32wb/Kconfig.series | 1 - soc/arm/ti_lm3s6965/Kconfig.soc | 1 - soc/arm/ti_simplelink/cc2650/Kconfig.series | 1 - soc/arm/ti_simplelink/cc32xx/Kconfig.series | 1 - soc/arm/ti_simplelink/msp432p4xx/Kconfig.series | 1 - 30 files changed, 1 insertion(+), 29 deletions(-) diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig index de38b72f352..5cd71995abb 100644 --- a/arch/arm/core/cortex_m/Kconfig +++ b/arch/arm/core/cortex_m/Kconfig @@ -207,6 +207,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 help This option signifies the use of an ARMv7-M processor implementation, or the use of a backwards-compatible diff --git a/soc/arm/arm/beetle/Kconfig.series b/soc/arm/arm/beetle/Kconfig.series index dda13794d26..8ded8a37890 100644 --- 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 index d6d3495b8f0..48486ed3913 100644 --- 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 index cdc5454852c..e438fadc222 100644 --- 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 index cf0c458a32e..b353f40cbcc 100644 --- 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 index c515eb385af..de2935f498a 100644 --- 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 index 8488b71419d..595c6953eed 100644 --- 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 index 3c3dd087641..25e4309232b 100644 --- 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/microchip_mec/mec1701/Kconfig.series b/soc/arm/microchip_mec/mec1701/Kconfig.series index 0f582ef5466..482c1683e8d 100644 --- a/soc/arm/microchip_mec/mec1701/Kconfig.series +++ b/soc/arm/microchip_mec/mec1701/Kconfig.series @@ -9,7 +9,6 @@ config SOC_SERIES_MEC1701X bool "Microchip MEC1701X Series" 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 index 1602977f68a..dedea83e868 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series @@ -11,7 +11,6 @@ config SOC_SERIES_IMX_6X_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 index bcef826cd0e..3565ffbda09 100644 --- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series @@ -9,7 +9,6 @@ config SOC_SERIES_IMX7_M4 bool "i.MX7 M4 Core Series" 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 index 432280f11c4..b0054f200b1 100644 --- 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 index 7f26ed643cc..cf2e65f7cab 100644 --- 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/silabs_exx32/efm32pg12b/Kconfig.series b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series index 49f1a8c77db..e1933899223 100644 --- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_EFM32PG12B select CPU_CORTEX_M4 select CPU_HAS_FPU select SOC_FAMILY_EXX32 - select CPU_HAS_SYSTICK select HAS_SYS_POWER_STATE_SLEEP_1 select HAS_SYS_POWER_STATE_SLEEP_2 select HAS_SYS_POWER_STATE_SLEEP_3 diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.series b/soc/arm/silabs_exx32/efm32wg/Kconfig.series index 32be666043d..68afd4ec8db 100644 --- a/soc/arm/silabs_exx32/efm32wg/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_EFM32WG select CPU_CORTEX_M4 select CPU_HAS_FPU select SOC_FAMILY_EXX32 - select CPU_HAS_SYSTICK select HAS_SILABS_GECKO select SOC_GECKO_CMU select SOC_GECKO_GPIO diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series index 88ef71f68ef..a4133fc1548 100644 --- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_EFR32FG1P select CPU_CORTEX_M4 select CPU_HAS_FPU select SOC_FAMILY_EXX32 - select CPU_HAS_SYSTICK select HAS_SYS_POWER_STATE_SLEEP_1 select HAS_SYS_POWER_STATE_SLEEP_2 select HAS_SYS_POWER_STATE_SLEEP_3 diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series index 513ec32ee5d..6ac4530466b 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_EFR32MG12P select CPU_CORTEX_M4 select CPU_HAS_FPU select SOC_FAMILY_EXX32 - select CPU_HAS_SYSTICK select HAS_SILABS_GECKO select HAS_SWO select HAS_SYS_POWER_STATE_SLEEP_1 diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.series b/soc/arm/st_stm32/stm32f1/Kconfig.series index 0fc523f0a0f..82bc3403c3c 100644 --- a/soc/arm/st_stm32/stm32f1/Kconfig.series +++ b/soc/arm/st_stm32/stm32f1/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_STM32F1X select CPU_CORTEX_M3 select SOC_FAMILY_STM32 select HAS_STM32CUBE - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32F1 MCU series diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.series b/soc/arm/st_stm32/stm32f2/Kconfig.series index 1b31953ab29..e520c4f5f0a 100644 --- a/soc/arm/st_stm32/stm32f2/Kconfig.series +++ b/soc/arm/st_stm32/stm32f2/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_STM32F2X select CPU_CORTEX_M3 select SOC_FAMILY_STM32 select HAS_STM32CUBE - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for stm32f2 MCU series diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.series b/soc/arm/st_stm32/stm32f3/Kconfig.series index d486861ef74..5186e11af2b 100644 --- a/soc/arm/st_stm32/stm32f3/Kconfig.series +++ b/soc/arm/st_stm32/stm32f3/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_STM32F3X select CPU_CORTEX_M4 select SOC_FAMILY_STM32 select CPU_HAS_FPU - select CPU_HAS_SYSTICK select HAS_STM32CUBE select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.series b/soc/arm/st_stm32/stm32f4/Kconfig.series index bab3dd06e14..ef87a4f20d2 100644 --- a/soc/arm/st_stm32/stm32f4/Kconfig.series +++ b/soc/arm/st_stm32/stm32f4/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_STM32F4X select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32F4 MCU series diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.series b/soc/arm/st_stm32/stm32f7/Kconfig.series index b9624e327b1..1ebd070db5c 100644 --- a/soc/arm/st_stm32/stm32f7/Kconfig.series +++ b/soc/arm/st_stm32/stm32f7/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_STM32F7X select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32F7 MCU series diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.series b/soc/arm/st_stm32/stm32l1/Kconfig.series index ff2f65929bc..48f0fc1d0b9 100644 --- a/soc/arm/st_stm32/stm32l1/Kconfig.series +++ b/soc/arm/st_stm32/stm32l1/Kconfig.series @@ -10,7 +10,6 @@ config SOC_SERIES_STM32L1X select CPU_CORTEX_M3 select SOC_FAMILY_STM32 select HAS_STM32CUBE - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32L1 MCU series diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.series b/soc/arm/st_stm32/stm32l4/Kconfig.series index 70d4a04f5af..f703174a9c3 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.series +++ b/soc/arm/st_stm32/stm32l4/Kconfig.series @@ -13,7 +13,6 @@ config SOC_SERIES_STM32L4X select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32L4 MCU series diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.series index d80e89895cf..53f252cb705 100644 --- a/soc/arm/st_stm32/stm32mp1/Kconfig.series +++ b/soc/arm/st_stm32/stm32mp1/Kconfig.series @@ -11,6 +11,5 @@ config SOC_SERIES_STM32MP1X select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU - select CPU_HAS_SYSTICK help Enable support for STM32MP1 MPU series diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.series b/soc/arm/st_stm32/stm32wb/Kconfig.series index 4f2c41839c2..76267f27873 100644 --- a/soc/arm/st_stm32/stm32wb/Kconfig.series +++ b/soc/arm/st_stm32/stm32wb/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_STM32WBX select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU - select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL help Enable support for STM32WB MCU series diff --git a/soc/arm/ti_lm3s6965/Kconfig.soc b/soc/arm/ti_lm3s6965/Kconfig.soc index 2967d8ebf54..9e34b2a54a9 100644 --- a/soc/arm/ti_lm3s6965/Kconfig.soc +++ b/soc/arm/ti_lm3s6965/Kconfig.soc @@ -3,4 +3,3 @@ config SOC_TI_LM3S6965 bool "TI LM3S6965" select CPU_CORTEX_M3 - select CPU_HAS_SYSTICK diff --git a/soc/arm/ti_simplelink/cc2650/Kconfig.series b/soc/arm/ti_simplelink/cc2650/Kconfig.series index 019c3198187..75c23400b11 100644 --- a/soc/arm/ti_simplelink/cc2650/Kconfig.series +++ b/soc/arm/ti_simplelink/cc2650/Kconfig.series @@ -7,6 +7,5 @@ config SOC_SERIES_CC2650 bool "TI SimpleLink Family CC2650" select CPU_CORTEX_M3 select SOC_FAMILY_TISIMPLELINK - select CPU_HAS_SYSTICK help Enable support for TI SimpleLink CC2650. diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.series b/soc/arm/ti_simplelink/cc32xx/Kconfig.series index bfa13093862..aa7ec338bdf 100644 --- a/soc/arm/ti_simplelink/cc32xx/Kconfig.series +++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.series @@ -7,6 +7,5 @@ config SOC_SERIES_CC32XX bool "TI SimpleLink Family" select CPU_CORTEX_M4 select SOC_FAMILY_TISIMPLELINK - select CPU_HAS_SYSTICK help Enable support for TI SimpleLink CC32xx diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series index 8bf0b31b5e1..773c6f3a65b 100644 --- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series +++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series @@ -10,6 +10,5 @@ config SOC_SERIES_MSP432P4XX select CPU_CORTEX_M4 select SOC_FAMILY_TISIMPLELINK select CPU_HAS_FPU - select CPU_HAS_SYSTICK help Enable support for TI SimpleLink MSP432P4XX.