From 5eb71b45b4595dd93131da08bf8ba83f3587cf63 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 18 Oct 2019 02:12:42 +0900 Subject: [PATCH] soc: arm: Clean up HAS_CMSIS_CORE usage. For nordic_nrf, this commit relocates HAS_CMSIS_CORE selection from SoC Kconfig to the HAL module Kconfig, as done for other SoCs. For nxp_kinetis, remove redundant HAS_CMSIS_CORE selection in SoC Kconfig, as it is already selected by the HAL Kconfig. Signed-off-by: Stephanos Ioannidis --- modules/Kconfig.nordic | 1 + soc/arm/nordic_nrf/nrf51/Kconfig.series | 1 - soc/arm/nordic_nrf/nrf52/Kconfig.series | 1 - soc/arm/nordic_nrf/nrf91/Kconfig.series | 1 - soc/arm/nxp_kinetis/k2x/Kconfig.soc | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/Kconfig.nordic b/modules/Kconfig.nordic index 511001965a9..86a11e2d112 100644 --- a/modules/Kconfig.nordic +++ b/modules/Kconfig.nordic @@ -6,6 +6,7 @@ config HAS_NORDIC_DRIVERS config HAS_NRFX bool + select HAS_CMSIS_CORE menu "nrfx drivers" depends on HAS_NRFX diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series index 9d6e9dbf117..aaad0cd4982 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.series @@ -12,7 +12,6 @@ config SOC_SERIES_NRF51X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS_CORE select HAS_NRFX select HAS_SEGGER_RTT help diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series index ef8a64a463e..23923c26048 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series @@ -13,7 +13,6 @@ config SOC_SERIES_NRF52X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS_CORE select HAS_NRFX select HAS_SEGGER_RTT help diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series index 6e41bb7b50d..8e7b38223a7 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series @@ -15,7 +15,6 @@ config SOC_SERIES_NRF91X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS_CORE select HAS_NRFX select HAS_SEGGER_RTT help diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.soc b/soc/arm/nxp_kinetis/k2x/Kconfig.soc index bed8ccc4977..3fb831d76dc 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc @@ -22,7 +22,6 @@ config SOC_MK22F51212 select HAS_MCUX_SIM select HAS_OSC select HAS_MCG - select HAS_CMSIS_CORE select CPU_HAS_FPU endchoice