diff --git a/CMSIS/Core/Include/cmsis_version.h b/CMSIS/Core/Include/cmsis_version.h
index 08c82f60..92f96c47 100644
--- a/CMSIS/Core/Include/cmsis_version.h
+++ b/CMSIS/Core/Include/cmsis_version.h
@@ -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 */
diff --git a/CMSIS/Documentation/Doxygen/Core/Core.dxy.in b/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
index b9524b59..2f3c2874 100644
--- a/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
+++ b/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
@@ -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
diff --git a/CMSIS/Documentation/Doxygen/Core/src/history.md b/CMSIS/Documentation/Doxygen/Core/src/history.md
index 87bf2412..e0ec2e56 100644
--- a/CMSIS/Documentation/Doxygen/Core/src/history.md
+++ b/CMSIS/Documentation/Doxygen/Core/src/history.md
@@ -10,6 +10,17 @@ The table below provides information about the changes delivered with specific v
| Version |
Description |
+
+ | V6.4.0 |
+
+
+ - Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles
+ - Added TI Arm Clang compiler support and fixed its program start definition
+ - 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
+
+ |
+
| V6.3.0 |
diff --git a/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in b/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
index 1d90a004..bf5f5642 100644
--- a/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
+++ b/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
@@ -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
diff --git a/CMSIS/Documentation/Doxygen/Core_A/src/history.md b/CMSIS/Documentation/Doxygen/Core_A/src/history.md
index 8f883fd0..86a35af3 100644
--- a/CMSIS/Documentation/Doxygen/Core_A/src/history.md
+++ b/CMSIS/Documentation/Doxygen/Core_A/src/history.md
@@ -9,6 +9,17 @@ The table below provides information about the changes delivered with specific v
| Version |
Description |
+
+ | V6.4.0 |
+
+
+ - Added initial support for Armv8-A, Armv7-R, and Armv8-R profiles
+ - Added TI Arm Clang compiler support and fixed its program start definition
+ - 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
+
+ |
+
| V6.3.0 |
diff --git a/CMSIS/Documentation/Doxygen/General/src/revision_history.md b/CMSIS/Documentation/Doxygen/General/src/revision_history.md
index 821af764..63309374 100644
--- a/CMSIS/Documentation/Doxygen/General/src/revision_history.md
+++ b/CMSIS/Documentation/Doxygen/General/src/revision_history.md
@@ -18,6 +18,12 @@ Release history of other CMSIS components and tools can be found in their docume
|
| 6.4.0 |
+ - 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
|