Pack: Aligned version numbers.
- Version histories
- Doxyfiles
- Config files
- README.md
- Fixed linter.py
Change-Id: I5a174ec423339d0ed029b07a393bf1f5819bfb6b
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index d04a317..4b72353 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -52,7 +52,7 @@
CMSIS-Driver: 2.8.0
- removed volatile from status related typedefs in APIs
- enhanced WiFi Interface API with support for polling Socket Receive/Send
- CMSIS-Pack:
+ CMSIS-Pack: 1.6.1
- added custom attribute to components that require custom implementation
Devices:
- ARMv81MML startup code recognizing __MVE_USED macro
@@ -2873,10 +2873,10 @@
<!-- include folder / device header file -->
<file category="include" name="Device/ARM/ARMCM55/Include/"/>
<!-- startup / system file -->
- <file category="sourceC" name="Device/ARM/ARMCM55/Source/startup_ARMCM55.c" version="2.0.2" attr="config"/>
+ <file category="sourceC" name="Device/ARM/ARMCM55/Source/startup_ARMCM55.c" version="1.0.0" attr="config"/>
<file category="linkerScript" name="Device/ARM/ARMCM55/Source/ARM/ARMCM55_ac6.sct" version="1.0.0" attr="config" condition="ARMCC6"/>
- <file category="linkerScript" name="Device/ARM/ARMCM55/Source/GCC/gcc_arm.ld" version="2.0.0" attr="config" condition="GCC"/>
- <file category="sourceC" name="Device/ARM/ARMCM55/Source/system_ARMCM55.c" version="1.2.0" attr="config"/>
+ <file category="linkerScript" name="Device/ARM/ARMCM55/Source/GCC/gcc_arm.ld" version="2.0.1" attr="config" condition="GCC"/>
+ <file category="sourceC" name="Device/ARM/ARMCM55/Source/system_ARMCM55.c" version="1.0.0" attr="config"/>
<!-- SAU configuration -->
<file category="header" name="Device/ARM/ARMCM55/Include/Template/partition_ARMCM55.h" version="1.0.0" attr="config" condition="TZ Secure"/>
</files>
@@ -3007,7 +3007,7 @@
<!-- startup / system file -->
<file category="sourceC" name="Device/ARM/ARMv81MML/Source/startup_ARMv81MML.c" version="2.0.2" attr="config"/>
<file category="linkerScript" name="Device/ARM/ARMv81MML/Source/ARM/ARMv81MML_ac6.sct" version="1.0.0" attr="config" condition="ARMCC6"/>
- <file category="linkerScript" name="Device/ARM/ARMv81MML/Source/GCC/gcc_arm.ld" version="2.0.0" attr="config" condition="GCC"/>
+ <file category="linkerScript" name="Device/ARM/ARMv81MML/Source/GCC/gcc_arm.ld" version="2.0.1" attr="config" condition="GCC"/>
<file category="sourceC" name="Device/ARM/ARMv81MML/Source/system_ARMv81MML.c" version="1.2.1" attr="config"/>
<!-- SAU configuration -->
<file category="header" name="Device/ARM/ARMv81MML/Include/Template/partition_ARMv81MML.h" version="1.0.1" attr="config" condition="TZ Secure"/>
diff --git a/CMSIS/DoxyGen/Core/src/Overview.txt b/CMSIS/DoxyGen/Core/src/Overview.txt
index b4958cf..100d1ce 100644
--- a/CMSIS/DoxyGen/Core/src/Overview.txt
+++ b/CMSIS/DoxyGen/Core/src/Overview.txt
@@ -100,7 +100,7 @@
<td>V5.4.0</td>
<td>
\if ARMv8M
- Added: Cortex-M55 support.\n
+ Added: Cortex-M55 support.
\endif
</td>
</tr>
@@ -228,7 +228,7 @@
Added: function \ref SCB_GetFPUType to all CMSIS cores.\n
Added: ARMv8-M support.
</td>
- </tr
+ </tr>
<tr>
<td>V4.30</td>
<td>
diff --git a/CMSIS/DoxyGen/General/general.dxy b/CMSIS/DoxyGen/General/general.dxy
index 39da4c9..d3cd0af 100644
--- a/CMSIS/DoxyGen/General/general.dxy
+++ b/CMSIS/DoxyGen/General/general.dxy
@@ -38,7 +38,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "Version 5.6.0"
+PROJECT_NUMBER = "Version 5.7.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/DoxyGen/General/src/introduction.txt b/CMSIS/DoxyGen/General/src/introduction.txt
index d9ba078..1005382 100644
--- a/CMSIS/DoxyGen/General/src/introduction.txt
+++ b/CMSIS/DoxyGen/General/src/introduction.txt
@@ -168,6 +168,26 @@
<th>Description</th>
</tr>
<tr>
+ <td>5.7.0</td>
+ <td>
+ - CMSIS-Core (Cortex-M) 5.4.0
+ - CMSIS-Core (Cortex-A) 1.1.4 (unchanged)
+ - CMSIS-Driver 2.8.0
+ - CMSIS-DSP 1.8.0
+ - CMSIS-NN 1.3.0
+ - CMSIS-RTOS 2.1.3 (unchanged)
+ - RTX 5.5.5 (see revision history for details)
+ - CMSIS-Pack 1.6.1
+ - CMSIS-SVD 1.3.3 (unchanged)
+ - CMSIS-DAP 2.0.0 (unchanged)
+ - CMSIS-Zone 1.0.0
+ - Devices
+ - Utilities
+ - SVDConv 3.3.27
+ - PackChk 1.3.82
+ </td>
+ </tr>
+ <tr>
<td>5.6.0</td>
<td>
- CMSIS-Core (Cortex-M) 5.3.0
@@ -180,7 +200,7 @@
- New Neon versions of f32 functions
- Compilation flags for FFTs
- CMSIS-NN 1.2.0 (unchanged)
- - CMSIS-RTOS 1.03 (unchanged)
+ - CMSIS-RTOS1 1.03 (unchanged)
- RTX 4.82.0 (see revision history for details)
- CMSIS-RTOS 2.1.3 (unchanged)
- RTX 5.5.1 (see revision history for details)
diff --git a/CMSIS/DoxyGen/NN/nn.dxy b/CMSIS/DoxyGen/NN/nn.dxy
index 238db4e..81bc9c8 100644
--- a/CMSIS/DoxyGen/NN/nn.dxy
+++ b/CMSIS/DoxyGen/NN/nn.dxy
@@ -38,7 +38,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "Version 1.2.0"
+PROJECT_NUMBER = "Version 1.3.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/DoxyGen/NN/src/history.txt b/CMSIS/DoxyGen/NN/src/history.txt
index 07f6db1..d5c83d7 100644
--- a/CMSIS/DoxyGen/NN/src/history.txt
+++ b/CMSIS/DoxyGen/NN/src/history.txt
@@ -28,23 +28,23 @@
<li>arm_relu6_s8</li>
<li>arm_reshape_s8</li>
<li>arm_fully_connected_s8</li>
- <li>arm_concatenation_s8_w/li>
- <li>arm_concatenation_s8_x/li>
- <li>arm_concatenation_s8_y/li>
- <li>arm_concatenation_s8_z/li>
+ <li>arm_concatenation_s8_w</li>
+ <li>arm_concatenation_s8_x</li>
+ <li>arm_concatenation_s8_y</li>
+ <li>arm_concatenation_s8_z</li>
</ul>
Added following support functions.<br>
<ul>
<li>arm_nn_mat_mul_kernel_s8_s16</li>
<li>arm_nn_mat_mul_kernel_s8_s16_reordered</li>
- <li>arm_nn_depthwise_conv_s8_core/li>
- <li>arm_nn_mat_mul_core_4x_s8/li>
- <li>arm_nn_mat_mul_core_1x_s8/li>
- <li>arm_convolve_1_x_n_s8/li>
- <li>arm_nn_vec_mat_mult_t_s8/li>
- <li>arm_nn_mat_mult_nt_t_s8/li>
- <li>arm_nn_depthwise_conv_nt_t_s8/li>
- <li>arm_nn_depthwise_conv_nt_t_padded_s8/li>
+ <li>arm_nn_depthwise_conv_s8_core</li>
+ <li>arm_nn_mat_mul_core_4x_s8</li>
+ <li>arm_nn_mat_mul_core_1x_s8</li>
+ <li>arm_convolve_1_x_n_s8</li>
+ <li>arm_nn_vec_mat_mult_t_s8</li>
+ <li>arm_nn_mat_mult_nt_t_s8</li>
+ <li>arm_nn_depthwise_conv_nt_t_s8</li>
+ <li>arm_nn_depthwise_conv_nt_t_padded_s8</li>
</ul>
</td>
</tr>
diff --git a/CMSIS/DoxyGen/Pack/src/pack_check.txt b/CMSIS/DoxyGen/Pack/src/pack_check.txt
index 2c4628e..213173f 100644
--- a/CMSIS/DoxyGen/Pack/src/pack_check.txt
+++ b/CMSIS/DoxyGen/Pack/src/pack_check.txt
@@ -195,7 +195,7 @@
<td>The PDSC file expected has not been found. Rename or exchange the PDSC file.</td>
</tr>
<tr><td>M208</td> <td>ERROR</td> <td>Error calling SVDConv: \em 'PATH'</td>
- <td><a href="../../SVD/html/svd_SVDConv_pg">SVDConv utility</a> could not be executed.
+ <td><a href="../../SVD/html/svd_SVDConv_pg.html">SVDConv utility</a> could not be executed.
<br>Verify the permissions. Correct the path name.</td>
</tr>
<tr><td>M209</td> <td>ERROR</td> <td>Unknown Option: \em 'OPT'</td>
@@ -205,7 +205,7 @@
<td>You can only check one PDSC file at a time.</td>
</tr>
<tr><td>M211</td> <td>ERROR</td> <td>Cannot find SVDConv.exe: \em 'CMDLINE'</td>
- <td><a href="../../SVD/html/svd_SVDConv_pg">SVDConv utility</a> was not found in specified \em 'CMDLINE'.
+ <td><a href="../../SVD/html/svd_SVDConv_pg.html">SVDConv utility</a> was not found in specified \em 'CMDLINE'.
<br>Copy the \b SVDConv.exe into the directory of \b packChk. Default is \token{CMSIS\\Utilities}.</td>
</tr>
</table>
diff --git a/Device/ARM/ARMCM0/Source/ARM/startup_ARMCM0.s b/Device/ARM/ARMCM0/Source/ARM/startup_ARMCM0.s
index bc22450..25a8530 100644
--- a/Device/ARM/ARMCM0/Source/ARM/startup_ARMCM0.s
+++ b/Device/ARM/ARMCM0/Source/ARM/startup_ARMCM0.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM0.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM0 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM0/Source/IAR/startup_ARMCM0.s b/Device/ARM/ARMCM0/Source/IAR/startup_ARMCM0.s
index c74cee0..3220f32 100644
--- a/Device/ARM/ARMCM0/Source/IAR/startup_ARMCM0.s
+++ b/Device/ARM/ARMCM0/Source/IAR/startup_ARMCM0.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM0.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM0 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM0/Source/system_ARMCM0.c b/Device/ARM/ARMCM0/Source/system_ARMCM0.c
index 66a364c..bf724ae 100644
--- a/Device/ARM/ARMCM0/Source/system_ARMCM0.c
+++ b/Device/ARM/ARMCM0/Source/system_ARMCM0.c
@@ -2,7 +2,7 @@
* @file system_ARMCM0.c
* @brief CMSIS Device System Source File for
* ARMCM0 Device
- * @version V5.3.1
+ * @version V1.0.0
* @date 09. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMCM0plus/Source/ARM/startup_ARMCM0plus.s b/Device/ARM/ARMCM0plus/Source/ARM/startup_ARMCM0plus.s
index 4d4fed3..cb71012 100644
--- a/Device/ARM/ARMCM0plus/Source/ARM/startup_ARMCM0plus.s
+++ b/Device/ARM/ARMCM0plus/Source/ARM/startup_ARMCM0plus.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM0plus.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM0plus Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM0plus/Source/IAR/startup_ARMCM0plus.s b/Device/ARM/ARMCM0plus/Source/IAR/startup_ARMCM0plus.s
index 9e315be..ebbe883 100644
--- a/Device/ARM/ARMCM0plus/Source/IAR/startup_ARMCM0plus.s
+++ b/Device/ARM/ARMCM0plus/Source/IAR/startup_ARMCM0plus.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM0plus.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM0plus Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c b/Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c
index 1f839bb..3bde8e1 100644
--- a/Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c
+++ b/Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c
@@ -2,7 +2,7 @@
* @file system_ARMCM0plus.c
* @brief CMSIS Device System Source File for
* ARMCM0plus Device
- * @version V5.3.1
+ * @version V1.0.0
* @date 09. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMCM1/Source/ARM/startup_ARMCM1.s b/Device/ARM/ARMCM1/Source/ARM/startup_ARMCM1.s
index 38126af..0ce627b 100644
--- a/Device/ARM/ARMCM1/Source/ARM/startup_ARMCM1.s
+++ b/Device/ARM/ARMCM1/Source/ARM/startup_ARMCM1.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM1.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM1 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM1/Source/IAR/startup_ARMCM1.s b/Device/ARM/ARMCM1/Source/IAR/startup_ARMCM1.s
index 8fe7d56..9691d81 100644
--- a/Device/ARM/ARMCM1/Source/IAR/startup_ARMCM1.s
+++ b/Device/ARM/ARMCM1/Source/IAR/startup_ARMCM1.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM1.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM1 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 20. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM1/Source/system_ARMCM1.c b/Device/ARM/ARMCM1/Source/system_ARMCM1.c
index a1f7ec8..75ad737 100644
--- a/Device/ARM/ARMCM1/Source/system_ARMCM1.c
+++ b/Device/ARM/ARMCM1/Source/system_ARMCM1.c
@@ -2,7 +2,7 @@
* @file system_ARMCM1.c
* @brief CMSIS Device System Source File for
* ARMCM1 Device
- * @version V5.3.1
+ * @version V1.0.0
* @date 20. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMCM23/Include/Template/partition_ARMCM23.h b/Device/ARM/ARMCM23/Include/Template/partition_ARMCM23.h
index a7a090e..7738365 100644
--- a/Device/ARM/ARMCM23/Include/Template/partition_ARMCM23.h
+++ b/Device/ARM/ARMCM23/Include/Template/partition_ARMCM23.h
@@ -1,7 +1,7 @@
/**************************************************************************//**
* @file partition_ARMCM23.h
* @brief CMSIS-CORE Initial Setup for Secure / Non-Secure Zones for ARMCM23
- * @version V5.3.1
+ * @version V1.0.0
* @date 09. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMCM23/Source/ARM/startup_ARMCM23.s b/Device/ARM/ARMCM23/Source/ARM/startup_ARMCM23.s
index bf69c11..96ed8a2 100644
--- a/Device/ARM/ARMCM23/Source/ARM/startup_ARMCM23.s
+++ b/Device/ARM/ARMCM23/Source/ARM/startup_ARMCM23.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM23.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM23 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM23/Source/IAR/startup_ARMCM23.s b/Device/ARM/ARMCM23/Source/IAR/startup_ARMCM23.s
index baa9cad..416fc78 100644
--- a/Device/ARM/ARMCM23/Source/IAR/startup_ARMCM23.s
+++ b/Device/ARM/ARMCM23/Source/IAR/startup_ARMCM23.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM23.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM23 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM3/Source/ARM/startup_ARMCM3.s b/Device/ARM/ARMCM3/Source/ARM/startup_ARMCM3.s
index 9b63b7e..87dfe2f 100644
--- a/Device/ARM/ARMCM3/Source/ARM/startup_ARMCM3.s
+++ b/Device/ARM/ARMCM3/Source/ARM/startup_ARMCM3.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM3.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM3 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s b/Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s
index a0d2505..47ad2ff 100644
--- a/Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s
+++ b/Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM3.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM3 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM33/Source/ARM/startup_ARMCM33.s b/Device/ARM/ARMCM33/Source/ARM/startup_ARMCM33.s
index 0b1e939..b1951d7 100644
--- a/Device/ARM/ARMCM33/Source/ARM/startup_ARMCM33.s
+++ b/Device/ARM/ARMCM33/Source/ARM/startup_ARMCM33.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM33.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM33 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM33/Source/IAR/startup_ARMCM33.s b/Device/ARM/ARMCM33/Source/IAR/startup_ARMCM33.s
index 5d6bdc4..169336d 100644
--- a/Device/ARM/ARMCM33/Source/IAR/startup_ARMCM33.s
+++ b/Device/ARM/ARMCM33/Source/IAR/startup_ARMCM33.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM33.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM33 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM35P/Source/ARM/startup_ARMCM35P.s b/Device/ARM/ARMCM35P/Source/ARM/startup_ARMCM35P.s
index 6700412..d5b7bae 100644
--- a/Device/ARM/ARMCM35P/Source/ARM/startup_ARMCM35P.s
+++ b/Device/ARM/ARMCM35P/Source/ARM/startup_ARMCM35P.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM35P.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM35P Device
-; * @version V5.5.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S b/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S
index 1d32c4e..60b055c 100644
--- a/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S
+++ b/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S
@@ -1,7 +1,7 @@
/**************************************************************************//**
* @file startup_ARMCM35P.S
* @brief CMSIS-Core(M) Device Startup File for Cortex-M35P Device
- * @version V2.0.1
+ * @version V1.0.1
* @date 23. July 2019
******************************************************************************/
/*
diff --git a/Device/ARM/ARMCM35P/Source/IAR/startup_ARMCM35P.s b/Device/ARM/ARMCM35P/Source/IAR/startup_ARMCM35P.s
index 146581d..e5cee96 100644
--- a/Device/ARM/ARMCM35P/Source/IAR/startup_ARMCM35P.s
+++ b/Device/ARM/ARMCM35P/Source/IAR/startup_ARMCM35P.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM35P.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM35P Device
-; * @version V5.4.1
+; * @version V2.0.0
; * @date 03. September 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM4/Source/ARM/startup_ARMCM4.s b/Device/ARM/ARMCM4/Source/ARM/startup_ARMCM4.s
index c89fdf8..ab1b387 100644
--- a/Device/ARM/ARMCM4/Source/ARM/startup_ARMCM4.s
+++ b/Device/ARM/ARMCM4/Source/ARM/startup_ARMCM4.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM4.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM4 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM4/Source/IAR/startup_ARMCM4.s b/Device/ARM/ARMCM4/Source/IAR/startup_ARMCM4.s
index eaed8da..2d1a9a3 100644
--- a/Device/ARM/ARMCM4/Source/IAR/startup_ARMCM4.s
+++ b/Device/ARM/ARMCM4/Source/IAR/startup_ARMCM4.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM4.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM4 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM7/Source/ARM/startup_ARMCM7.s b/Device/ARM/ARMCM7/Source/ARM/startup_ARMCM7.s
index 568dfe3..93d11e3 100644
--- a/Device/ARM/ARMCM7/Source/ARM/startup_ARMCM7.s
+++ b/Device/ARM/ARMCM7/Source/ARM/startup_ARMCM7.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM7.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM7 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMCM7/Source/IAR/startup_ARMCM7.s b/Device/ARM/ARMCM7/Source/IAR/startup_ARMCM7.s
index 69ce2ac..f011948 100644
--- a/Device/ARM/ARMCM7/Source/IAR/startup_ARMCM7.s
+++ b/Device/ARM/ARMCM7/Source/IAR/startup_ARMCM7.s
@@ -2,7 +2,7 @@
; * @file startup_ARMCM7.s
; * @brief CMSIS Core Device Startup File for
; * ARMCM7 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMSC000/Source/ARM/startup_ARMSC000.s b/Device/ARM/ARMSC000/Source/ARM/startup_ARMSC000.s
index cfcf761..2cf5034 100644
--- a/Device/ARM/ARMSC000/Source/ARM/startup_ARMSC000.s
+++ b/Device/ARM/ARMSC000/Source/ARM/startup_ARMSC000.s
@@ -2,7 +2,7 @@
; * @file startup_ARMSC000.s
; * @brief CMSIS Core Device Startup File for
; * ARMSC000 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMSC000/Source/IAR/startup_ARMSC000.s b/Device/ARM/ARMSC000/Source/IAR/startup_ARMSC000.s
index d884cbd..9d7153f 100644
--- a/Device/ARM/ARMSC000/Source/IAR/startup_ARMSC000.s
+++ b/Device/ARM/ARMSC000/Source/IAR/startup_ARMSC000.s
@@ -2,7 +2,7 @@
; * @file startup_ARMSC000.s
; * @brief CMSIS Core Device Startup File for
; * for ARMSC000 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMSC000/Source/system_ARMSC000.c b/Device/ARM/ARMSC000/Source/system_ARMSC000.c
index 067edc4..914bf11 100644
--- a/Device/ARM/ARMSC000/Source/system_ARMSC000.c
+++ b/Device/ARM/ARMSC000/Source/system_ARMSC000.c
@@ -2,7 +2,7 @@
* @file system_ARMSC000.c
* @brief CMSIS Device System Source File for
* for ARMSC000 Device
- * @version V5.3.1
+ * @version V1.0.0
* @date 09. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMSC300/Source/ARM/startup_ARMSC300.s b/Device/ARM/ARMSC300/Source/ARM/startup_ARMSC300.s
index 422b655..cd64634 100644
--- a/Device/ARM/ARMSC300/Source/ARM/startup_ARMSC300.s
+++ b/Device/ARM/ARMSC300/Source/ARM/startup_ARMSC300.s
@@ -2,7 +2,7 @@
; * @file startup_ARMSC300.s
; * @brief CMSIS Core Device Startup File for
; * ARMSC300 Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMSC300/Source/IAR/startup_ARMSC300.s b/Device/ARM/ARMSC300/Source/IAR/startup_ARMSC300.s
index 6b132e0..cd1476e 100644
--- a/Device/ARM/ARMSC300/Source/IAR/startup_ARMSC300.s
+++ b/Device/ARM/ARMSC300/Source/IAR/startup_ARMSC300.s
@@ -2,7 +2,7 @@
; * @file startup_ARMSC300.s
; * @brief CMSIS Core Device Startup File for
; * ARMSC300 Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMv8MBL/Include/Template/partition_ARMv8MBL.h b/Device/ARM/ARMv8MBL/Include/Template/partition_ARMv8MBL.h
index d6e9834..f87aa84 100644
--- a/Device/ARM/ARMv8MBL/Include/Template/partition_ARMv8MBL.h
+++ b/Device/ARM/ARMv8MBL/Include/Template/partition_ARMv8MBL.h
@@ -1,7 +1,7 @@
/**************************************************************************//**
* @file partition_ARMv8MBL.h
* @brief CMSIS-CORE Initial Setup for Secure / Non-Secure Zones for ARMv8MBL
- * @version V5.3.1
+ * @version V1.0.0
* @date 09. July 2018
******************************************************************************/
/*
diff --git a/Device/ARM/ARMv8MBL/Source/ARM/startup_ARMv8MBL.s b/Device/ARM/ARMv8MBL/Source/ARM/startup_ARMv8MBL.s
index 7ec7325..9983ca6 100644
--- a/Device/ARM/ARMv8MBL/Source/ARM/startup_ARMv8MBL.s
+++ b/Device/ARM/ARMv8MBL/Source/ARM/startup_ARMv8MBL.s
@@ -2,7 +2,7 @@
; * @file startup_ARMv8MBL.s
; * @brief CMSIS Core Device Startup File for
; * ARMv8MBL Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMv8MBL/Source/IAR/startup_ARMv8MBL.s b/Device/ARM/ARMv8MBL/Source/IAR/startup_ARMv8MBL.s
index 420b7f2..7bb7b5e 100644
--- a/Device/ARM/ARMv8MBL/Source/IAR/startup_ARMv8MBL.s
+++ b/Device/ARM/ARMv8MBL/Source/IAR/startup_ARMv8MBL.s
@@ -2,7 +2,7 @@
; * @file startup_ARMv8MBL.s
; * @brief CMSIS Core Device Startup File for
; * ARMv8MBL Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMv8MML/Source/ARM/startup_ARMv8MML.s b/Device/ARM/ARMv8MML/Source/ARM/startup_ARMv8MML.s
index c7ef5cd..adb7fe9 100644
--- a/Device/ARM/ARMv8MML/Source/ARM/startup_ARMv8MML.s
+++ b/Device/ARM/ARMv8MML/Source/ARM/startup_ARMv8MML.s
@@ -2,7 +2,7 @@
; * @file startup_ARMv8MML.s
; * @brief CMSIS Core Device Startup File for
; * ARMv8MML Device
-; * @version V5.4.1
+; * @version V1.0.1
; * @date 23. July 2019
; ******************************************************************************/
;/*
diff --git a/Device/ARM/ARMv8MML/Source/IAR/startup_ARMv8MML.s b/Device/ARM/ARMv8MML/Source/IAR/startup_ARMv8MML.s
index 21b5c2c..e47bf5f 100644
--- a/Device/ARM/ARMv8MML/Source/IAR/startup_ARMv8MML.s
+++ b/Device/ARM/ARMv8MML/Source/IAR/startup_ARMv8MML.s
@@ -2,7 +2,7 @@
; * @file startup_ARMv8MML.s
; * @brief CMSIS Core Device Startup File for
; * ARMv8MML Device
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/Device/_Template_Vendor/Vendor/Device/Source/IAR/startup_Device.s b/Device/_Template_Vendor/Vendor/Device/Source/IAR/startup_Device.s
index d505f00..03112a2 100644
--- a/Device/_Template_Vendor/Vendor/Device/Source/IAR/startup_Device.s
+++ b/Device/_Template_Vendor/Vendor/Device/Source/IAR/startup_Device.s
@@ -2,7 +2,7 @@
; * @file startup_<Device>.s
; * @brief CMSIS Cortex-M# Core Device Startup File for
; * Device <Device>
-; * @version V5.3.1
+; * @version V1.0.0
; * @date 09. July 2018
; ******************************************************************************/
;/*
diff --git a/README.md b/README.md
index ae4c2cd..26593ea 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# CMSIS Version 5
-The branch *master* of this GitHub repository contains the CMSIS Version 5.6.0. The [documentation](http://arm-software.github.io/CMSIS_5/General/html/index.html) is available under http://arm-software.github.io/CMSIS_5/General/html/index.html
+The branch *master* of this GitHub repository contains the CMSIS Version 5.7.0. The [documentation](http://arm-software.github.io/CMSIS_5/General/html/index.html) is available under http://arm-software.github.io/CMSIS_5/General/html/index.html
Use [Issues](https://github.com/ARM-software/CMSIS_5#issues-and-labels) to provide feedback and report problems for CMSIS Version 5.
diff --git a/linter.py b/linter.py
index bb03ee3..e3ff698 100644
--- a/linter.py
+++ b/linter.py
@@ -131,19 +131,27 @@
return self._pack.version()
def cmsis_corem_component(self):
- rte = { 'components' : set(), 'Dcore' : "Cortex-M3", 'Dvendor' : "", 'Dname' : "", 'Dtz' : "", 'Tcompiler' : "", 'Toptions' : "" }
- comp = sorted(self._pack.component_by_name(rte, "CMSIS.CORE"), reverse=True)[0]
- return SemanticVersion(comp.version())
+ rte = { 'components' : set(), 'Dcore' : "Cortex-M3", 'Dvendor' : "*", 'Dname' : "*", 'Dtz' : "*", 'Dsecure' : "*", 'Tcompiler' : "*", 'Toptions' : "*" }
+ cs = self._pack.component_by_name(rte, "CMSIS.CORE")
+ cvs = { SemanticVersion(c.version()) for c in cs }
+ if len(cvs) > 1:
+ self.warning("Not all CMSIS-Core(M) components have same version information: %s", str([ (c.name(), c.version()) for c in cs ]))
+ return cvs.pop()
def cmsis_corea_component(self):
- rte = { 'components' : set(), 'Dcore' : "Cortex-A9", 'Dvendor' : "", 'Dname' : "", 'Dtz' : "", 'Tcompiler' : "", 'Toptions' : "" }
- comp = sorted(self._pack.component_by_name(rte, "CMSIS.CORE"), reverse=True)[0]
- return SemanticVersion(comp.version())
+ rte = { 'components' : set(), 'Dcore' : "Cortex-A9", 'Dvendor' : "*", 'Dname' : "*", 'Dtz' : "*", 'Dsecure' : "*", 'Tcompiler' : "*", 'Toptions' : "*" }
+ cs = self._pack.component_by_name(rte, "CMSIS.CORE")
+ cvs = { SemanticVersion(c.version()) for c in cs }
+ if len(cvs) > 1:
+ self.warning("Not all CMSIS-Core(A) components have same version information: %s", str([ (c.name(), c.version()) for c in cs ]))
+ return cvs.pop()
def cmsis_rtos2_api(self):
- rte = { 'components' : set(), 'Dcore' : "", 'Dvendor' : "", 'Dname' : "", 'Dtz' : "", 'Tcompiler' : "", 'Toptions' : "" }
- comp = sorted(self._pack.component_by_name(rte, "CMSIS.RTOS2"), reverse=True)[0]
- return SemanticVersion(comp.version())
+ cs = self._pack.components_by_name("CMSIS.RTOS2")
+ cvs = { SemanticVersion(c.version()) for c in cs }
+ if len(cvs) > 1:
+ self.warning("Not all CMSIS-RTOS2 APIs have same version information: %s", str([ (c.name(), c.version()) for c in cs ]))
+ return cvs.pop()
def cmsis_rtx5_component(self):
cs = self._pack.components_by_name("CMSIS.RTOS2.Keil RTX5*")
@@ -284,7 +292,3 @@
self.warning("%s: Broken relative-link to %s!", html, href.path)
else:
self.warning("%s: Broken relative-link to %s!", html, href.path)
-
- def check_schema(self):
- """XML Schema"""
- pass
\ No newline at end of file