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 <root@stephanos.io>
diff --git a/arch/arm/core/Kconfig b/arch/arm/core/Kconfig
index 1a07078..acecd58 100644
--- a/arch/arm/core/Kconfig
+++ b/arch/arm/core/Kconfig
@@ -15,7 +15,7 @@
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 7da2e3b..25c5a1a 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 e0ba1ae..acf57da 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 21684b7..eb1f918 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 30635aa..dbb654d 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 41d43ab..71aba9b 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 b2fca60..6f386e8 100644
--- a/modules/Kconfig.simplelink
+++ b/modules/Kconfig.simplelink
@@ -22,7 +22,7 @@
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 286f468..ad53ec1 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 28409d9..9d6e9db 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.series
@@ -12,7 +12,7 @@
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 2ae01f5..ef8a64a 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series
@@ -13,7 +13,7 @@
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 c451832..6e41bb7 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series
@@ -15,7 +15,7 @@
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 2c40353..bed8ccc 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc
@@ -22,7 +22,7 @@
select HAS_MCUX_SIM
select HAS_OSC
select HAS_MCG
- select HAS_CMSIS
+ select HAS_CMSIS_CORE
select CPU_HAS_FPU
endchoice
