Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions ARM.CMSIS.pdsc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@
<repository type="git">https://github.com/ARM-software/CMSIS_6.git</repository>

<releases>
<release version="6.3.1-dev">
Active development ...
<release version="6.4.0-rc">
CMSIS-Core: 6.4.0 (see revision history for details)
- Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles
- Added TI Arm Clang compiler support
- Added SCB Secure Fault Status and Secure Fault Address Register bitfield definitions; deprecated the corresponding SAU definitions
- Improved D-Cache disable handling and fixed MPU attribute handling
- Fixed TI Arm Clang program start definition
- CMSIS-Driver: 2.12.0 (see revision history for details)
- Ethernet Driver API V2.3.0
- MCI Driver API V2.5.0
Expand Down Expand Up @@ -673,7 +678,7 @@

<components>
<!-- CMSIS-Core component -->
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv6_7_8-M Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.4.0" condition="ARMv6_7_8-M Device" >
<description>CMSIS-CORE for Cortex-M, SC000, SC300, Star-MC, ARMv8-M, ARMv8.1-M</description>
<files>
<!-- CPU independent -->
Expand All @@ -686,7 +691,7 @@
</files>
</component>

<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv7_8-A Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.4.0" condition="ARMv7_8-A Device" >
<description>CMSIS-CORE for Cortex-A</description>
<files>
<!-- CPU independent -->
Expand All @@ -695,7 +700,7 @@
</files>
</component>

<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv7-R Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.4.0" condition="ARMv7-R Device" >
<description>CMSIS-CORE for Cortex-R</description>
<files>
<!-- CPU independent -->
Expand Down
6 changes: 3 additions & 3 deletions CMSIS/Core/Include/cmsis_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@

/* CMSIS-Core(M) Version definitions */
#define __CM_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(M) main version */
#define __CM_CMSIS_VERSION_SUB ( 3U) /*!< \brief [15:0] CMSIS-Core(M) sub version */
#define __CM_CMSIS_VERSION_SUB ( 4U) /*!< \brief [15:0] CMSIS-Core(M) sub version */
#define __CM_CMSIS_VERSION ((__CM_CMSIS_VERSION_MAIN << 16U) | \
__CM_CMSIS_VERSION_SUB ) /*!< \brief CMSIS Core(M) version number */

/* CMSIS-Core(A) Version definitions */
#define __CA_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(A) main version */
#define __CA_CMSIS_VERSION_SUB ( 3U) /*!< \brief [15:0] CMSIS-Core(A) sub version */
#define __CA_CMSIS_VERSION_SUB ( 4U) /*!< \brief [15:0] CMSIS-Core(A) sub version */
#define __CA_CMSIS_VERSION ((__CA_CMSIS_VERSION_MAIN << 16U) | \
__CA_CMSIS_VERSION_SUB ) /*!< \brief CMSIS-Core(A) version number */

#define __CR_CMSIS_VERSION_MAIN (6U) /*!< \brief [31:16] CMSIS-Core(R) main version */
#define __CR_CMSIS_VERSION_SUB (3U) /*!< \brief [15:0] CMSIS-Core(R) sub version */
#define __CR_CMSIS_VERSION_SUB (4U) /*!< \brief [15:0] CMSIS-Core(R) sub version */
#define __CR_CMSIS_VERSION ((__CR_CMSIS_VERSION_MAIN << 16U) | \
__CR_CMSIS_VERSION_SUB ) /*!< \brief CMSIS-Core(R) version number */

Expand Down
2 changes: 1 addition & 1 deletion CMSIS/Documentation/Doxygen/Core/Core.dxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PROJECT_NAME = "CMSIS-Core (Cortex-M)"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 6.3.0"
PROJECT_NUMBER = "Version 6.4.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
11 changes: 11 additions & 0 deletions CMSIS/Documentation/Doxygen/Core/src/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@ The table below provides information about the changes delivered with specific v
<th>Version</th>
<th>Description</th>
</tr>
<tr>
<td>V6.4.0</td>
<td>
<ul>
<li>Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles</li>
<li>Added TI Arm Clang compiler support and fixed its program start definition</li>
<li>Added SCB Secure Fault Status and Secure Fault Address Register bitfield definitions; deprecated the corresponding SAU definitions</li>
<li>Improved D-Cache disable handling and fixed MPU attribute handling</li>
</ul>
</td>
</tr>
<tr>
<td>V6.3.0</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PROJECT_NAME = "CMSIS-Core (Cortex-A)"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 6.3.0"
PROJECT_NUMBER = "Version 6.4.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
11 changes: 11 additions & 0 deletions CMSIS/Documentation/Doxygen/Core_A/src/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@ The table below provides information about the changes delivered with specific v
<th>Version</th>
<th>Description</th>
</tr>
<tr>
<td>V6.4.0</td>
<td>
<ul>
<li>Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles</li>
<li>Added TI Arm Clang compiler support and fixed its program start definition</li>
<li>Added SCB Secure Fault Status and Secure Fault Address Register bitfield definitions; deprecated the corresponding SAU definitions</li>
<li>Improved D-Cache disable handling and fixed MPU attribute handling</li>
</ul>
</td>
</tr>
<tr>
<td>V6.3.0</td>
<td>
Expand Down
6 changes: 6 additions & 0 deletions CMSIS/Documentation/Doxygen/General/src/revision_history.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ Release history of other CMSIS components and tools can be found in their docume
<tr>
<td>6.4.0</td>
<td>
- CMSIS-Core: 6.4.0
- Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles
- Added TI Arm Clang compiler support
- Added SCB Secure Fault Status and Secure Fault Address Register bitfield definitions; deprecated the corresponding SAU definitions
- Improved D-Cache disable handling and fixed MPU attribute handling
- Fixed TI Arm Clang program start definition
- CMSIS-Driver: 2.12.0
- Updated Ethernet API to 2.3.0 with Gigabit Ethernet support
- Updated MCI API to 2.5.0 with UHS-I voltage switching and re-tuning support
Expand Down
Loading