From bb14d8c5e57fdcd23550f84b8b3e703f5dc807db Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 17 Oct 2019 09:42:35 +0900 Subject: [PATCH] ext: hal: cmsis: Update references to HAS_CMSIS to HAS_CMSIS_CORE. This commit updates all references to HAS_CMSIS to use HAS_CMSIS_CORE instead. With the changes introduced to allow multiple CMSIS variants to be specified, the latter is semantically equivalent to the former. For more details, see issue #19717. Signed-off-by: Stephanos Ioannidis --- arch/arm/core/Kconfig | 2 +- modules/Kconfig.atmel | 2 +- modules/Kconfig.cypress | 2 +- modules/Kconfig.imx | 2 +- modules/Kconfig.mcux | 2 +- modules/Kconfig.silabs | 2 +- modules/Kconfig.simplelink | 2 +- modules/Kconfig.stm32 | 2 +- soc/arm/nordic_nrf/nrf51/Kconfig.series | 2 +- soc/arm/nordic_nrf/nrf52/Kconfig.series | 2 +- soc/arm/nordic_nrf/nrf91/Kconfig.series | 2 +- soc/arm/nxp_kinetis/k2x/Kconfig.soc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/core/Kconfig b/arch/arm/core/Kconfig index 1a07078ffa0..acecd583e16 100644 --- a/arch/arm/core/Kconfig +++ b/arch/arm/core/Kconfig @@ -15,7 +15,7 @@ config CPU_CORTEX_M bool select CPU_CORTEX select ARCH_HAS_CUSTOM_SWAP_TO_MAIN - select HAS_CMSIS + select HAS_CMSIS_CORE select HAS_FLASH_LOAD_OFFSET select ARCH_HAS_THREAD_ABORT select ARCH_HAS_TRUSTED_EXECUTION if ARM_TRUSTZONE_M diff --git a/modules/Kconfig.atmel b/modules/Kconfig.atmel index 7da2e3bf42e..25c5a1afd68 100644 --- a/modules/Kconfig.atmel +++ b/modules/Kconfig.atmel @@ -6,7 +6,7 @@ config ASF bool - select HAS_CMSIS + select HAS_CMSIS_CORE depends on SOC_FAMILY_SAM || SOC_FAMILY_SAM0 config ATMEL_WINC1500 diff --git a/modules/Kconfig.cypress b/modules/Kconfig.cypress index e0ba1ae3e2f..acf57dadd5c 100644 --- a/modules/Kconfig.cypress +++ b/modules/Kconfig.cypress @@ -6,4 +6,4 @@ config HAS_CYPRESS_DRIVERS bool - select HAS_CMSIS + select HAS_CMSIS_CORE diff --git a/modules/Kconfig.imx b/modules/Kconfig.imx index 21684b74484..eb1f91810ba 100644 --- a/modules/Kconfig.imx +++ b/modules/Kconfig.imx @@ -5,7 +5,7 @@ config HAS_IMX_HAL bool - select HAS_CMSIS + select HAS_CMSIS_CORE depends on SOC_FAMILY_IMX if HAS_IMX_HAL diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux index 30635aa3491..dbb654dbfe1 100644 --- a/modules/Kconfig.mcux +++ b/modules/Kconfig.mcux @@ -5,7 +5,7 @@ config HAS_MCUX bool - select HAS_CMSIS + select HAS_CMSIS_CORE depends on SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC if HAS_MCUX diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs index 41d43abac66..71aba9b72f7 100644 --- a/modules/Kconfig.silabs +++ b/modules/Kconfig.silabs @@ -5,5 +5,5 @@ config HAS_SILABS_GECKO bool - select HAS_CMSIS + select HAS_CMSIS_CORE depends on SOC_FAMILY_EXX32 diff --git a/modules/Kconfig.simplelink b/modules/Kconfig.simplelink index b2fca60b7ee..6f386e8d456 100644 --- a/modules/Kconfig.simplelink +++ b/modules/Kconfig.simplelink @@ -22,7 +22,7 @@ config SIMPLELINK_HOST_DRIVER config HAS_MSP432P4XXSDK bool - select HAS_CMSIS + select HAS_CMSIS_CORE # Kconfig - CC13X2 / CC26X2 SDK HAL configuration diff --git a/modules/Kconfig.stm32 b/modules/Kconfig.stm32 index 286f4688434..ad53ec1c664 100644 --- a/modules/Kconfig.stm32 +++ b/modules/Kconfig.stm32 @@ -5,7 +5,7 @@ config HAS_STM32CUBE bool - select HAS_CMSIS + select HAS_CMSIS_CORE depends on SOC_FAMILY_STM32 if HAS_STM32CUBE diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series index 28409d9d877..9d6e9dbf117 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.series @@ -12,7 +12,7 @@ config SOC_SERIES_NRF51X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS + 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 2ae01f5d05b..ef8a64a463e 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series @@ -13,7 +13,7 @@ config SOC_SERIES_NRF52X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS + 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 c4518321559..6e41bb7b50d 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series @@ -15,7 +15,7 @@ config SOC_SERIES_NRF91X select SOC_FAMILY_NRF select HAS_SYS_POWER_STATE_DEEP_SLEEP_1 select XIP - select HAS_CMSIS + 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 2c4035304d1..bed8ccc4977 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc @@ -22,7 +22,7 @@ config SOC_MK22F51212 select HAS_MCUX_SIM select HAS_OSC select HAS_MCG - select HAS_CMSIS + select HAS_CMSIS_CORE select CPU_HAS_FPU endchoice