File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -632,8 +632,16 @@ script as well.
632
632
CMSIS
633
633
*****
634
634
635
- Cortex-M CMSIS headers are hosted in a standalone module repository:
636
- `zephyrproject-rtos/cmsis <https://github.com/zephyrproject-rtos/cmsis >`_.
635
+ Cortex-M CMSIS headers are provided through standalone module repositories:
636
+
637
+ - **CMSIS 5 **: `zephyrproject-rtos/cmsis <https://github.com/zephyrproject-rtos/cmsis >`_
638
+ - **CMSIS 6 **: `zephyrproject-rtos/CMSIS_6 <https://github.com/zephyrproject-rtos/CMSIS_6 >`_
639
+
640
+ Zephyr has begun transitioning to **CMSIS 6 ** as the default source for Cortex-M core headers.
641
+ However, at present, Zephyr includes headers from **both ** the CMSIS 6 and legacy CMSIS 5 modules.
642
+
643
+ The legacy CMSIS 5 headers remain available primarily for compatibility with vendor HALs, while all
644
+ new architecture-level development should use **CMSIS 6 ** headers whenever possible.
637
645
638
646
:kconfig:option: `CONFIG_CPU_CORTEX_M ` selects :kconfig:option: `CONFIG_HAS_CMSIS_CORE ` to signify that
639
647
CMSIS headers are available for all supported Cortex-M variants.
Original file line number Diff line number Diff line change @@ -771,3 +771,9 @@ Other notable changes
771
771
772
772
* Updated TF-M to version 2.1.2 (from 2.1.1). The release notes can be found at:
773
773
https://trustedfirmware-m.readthedocs.io/en/tf-mv2.1.2/releases/2.1.2.html
774
+
775
+ * As of commit f726cb5123eda12feb8746e3acb34a1f7d7b0340, Zephyr now uses the ``CMSIS_6 `` module
776
+ (instead of ``cmsis `` which was CMSIS 5.9.0) for Cortex-M architectures.
777
+ Other modules still relying on the older ``cmsis `` module are encouraged to migrate to ``CMSIS_6 ``.
778
+ The path to the ``CMSIS_6 `` module can be accessed via the ``CONFIG_ZEPHYR_CMSIS_6_MODULE_DIR `` configuration.
779
+ Note: Zephyr will continue using the older ``cmsis `` module for Cortex-A and Cortex-R targets.
You can’t perform that action at this time.
0 commit comments