Skip to content

modules: cmsis, cmsis_6: only add the intended cmsis module #93715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 5, 2025
Merged

modules: cmsis, cmsis_6: only add the intended cmsis module #93715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff8fca7
arch: arm: dwt: use the cmsis_6 macro unconditionally
fabiobaltieri Jul 25, 2025
549ec8d
manifest: update ambiq and microchip hals to pickup the cmsis_6 fixes
fabiobaltieri Jul 25, 2025
ba41268
modules: cmsis, cmsis_6: only add the intended cmsis module
fabiobaltieri Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions arch/arm/include/cortex_m/dwt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@ extern "C" {
* update to CMSIS_6.
*/
#if !defined DWT_LSR_Present_Msk
#define DWT_LSR_Present_Msk \
IF_ENABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_Present_Msk)) \
IF_DISABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_PRESENT_Msk))
#define DWT_LSR_Present_Msk ITM_LSR_PRESENT_Msk
#endif

#if !defined DWT_LSR_Access_Msk
#define DWT_LSR_Access_Msk \
IF_ENABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_Access_Msk)) \
IF_DISABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_ACCESS_Msk))
#define DWT_LSR_Access_Msk ITM_LSR_ACCESS_Msk
#endif

static inline void dwt_access(bool ena)
Expand Down
3 changes: 1 addition & 2 deletions modules/cmsis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright (c) 2023 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis)

if(CONFIG_CPU_AARCH32_CORTEX_A OR CONFIG_CPU_AARCH32_CORTEX_R)
add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis)
zephyr_include_directories(.)
endif()
3 changes: 1 addition & 2 deletions modules/cmsis_6/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright 2025 Arm Limited and/or its affiliates <[email protected]>
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis_6)

if(CONFIG_CPU_CORTEX_M)
add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} cmsis_6)
zephyr_include_directories(.)
endif()
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ manifest:
groups:
- hal
- name: hal_ambiq
revision: 84ccbfc0b6041ba9f5688337c78bad99da5448ce
revision: e9212585cd7c4e1cc189f7d530b8a028d5e8ecf5
path: modules/hal/ambiq
groups:
- hal
Expand Down Expand Up @@ -195,7 +195,7 @@ manifest:
groups:
- hal
- name: hal_microchip
revision: 32a79d481c056b2204a5701d5a5799f9e5130dd7
revision: 415c92d3c8bd3d62db35980729df42be1f178023
path: modules/hal/microchip
groups:
- hal
Expand Down