Merge branch 'develop/upstream' into master/upstream

JonatanAntoni · JonatanAntoni · commit decf9e99d1f2 · 2019-03-20T13:55:46.000+01:00
Change-Id: Icd8983e8e2f94cb4cf02b3c78b7fa179b654b4f0
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
diff --git a/CMSIS/Core/Include/cmsis_armclang_ltm.h b/CMSIS/Core/Include/cmsis_armclang_ltm.h
@@ -1,8 +1,8 @@
-^/**************************************************************************//**
- * @file     cmsis_armclang.h
+/**************************************************************************//**
+ * @file     cmsis_armclang_ltm.h
  * @brief    CMSIS compiler armclang (Arm Compiler 6) header file
- * @version  V1.0.0
- * @date     13. March 2019
+ * @version  V1.0.1
+ * @date     19. March 2019
  ******************************************************************************/
 /*
  * Copyright (c) 2018-2019 Arm Limited. All rights reserved.
diff --git a/CMSIS/DoxyGen/Core/core.dxy b/CMSIS/DoxyGen/Core/core.dxy
@@ -38,7 +38,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 5.2.0"
+PROJECT_NUMBER         = "Version 5.2.1"
 
 # 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/Core/core_CM0-7.dxy b/CMSIS/DoxyGen/Core/core_CM0-7.dxy
@@ -38,7 +38,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 5.2.0"
+PROJECT_NUMBER         = "Version 5.2.1"
 
 # 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/Core/src/Overview.txt b/CMSIS/DoxyGen/Core/src/Overview.txt
@@ -96,13 +96,19 @@ The \ref templates_pg supplied by Arm have been tested and verified with the fol
       <th>Version</th>
       <th>Description</th>
     </tr>
+    <tr>
+      <td>V5.2.1</td>
+      <td>
+        Fixed: Compilation issue in cmsis_armclang_ltm.h introduced in 5.2.0
+      </td>
+    </tr>
     <tr>
       <td>V5.2.0</td>
       <td>
         Added: Cortex-M35P support.\n
         Added: Cortex-M1 support.\n
         Added: Armv8.1 architecture support.\n
-		Added: \ref __RESTRICT and \ref __STATIC_FORCEINLINE compiler control macros.
+        Added: \ref __RESTRICT and \ref __STATIC_FORCEINLINE compiler control macros.
       </td>
     </tr>
     <tr>
diff --git a/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Device/ARMCM4_FP/startup_ARMCM4.s b/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Device/ARMCM4_FP/startup_ARMCM4.s
@@ -32,7 +32,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00000800
+Stack_Size      EQU     0x00000400
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -43,7 +43,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00080000
+Heap_Size       EQU     0x00000C00
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Device/ARM/ARMCM0/Source/GCC/startup_ARMCM0.S b/Device/ARM/ARMCM0/Source/GCC/startup_ARMCM0.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM0.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM0 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM0plus/Source/GCC/startup_ARMCM0plus.S b/Device/ARM/ARMCM0plus/Source/GCC/startup_ARMCM0plus.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM0plus.s
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM0plus Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM1/Source/GCC/startup_ARMCM1.S b/Device/ARM/ARMCM1/Source/GCC/startup_ARMCM1.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM1.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM1 Device
- * @version  V5.3.1
- * @date     20. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM23/Source/GCC/startup_ARMCM23.S b/Device/ARM/ARMCM23/Source/GCC/startup_ARMCM23.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM23.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM23 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM3/Source/GCC/startup_ARMCM3.S b/Device/ARM/ARMCM3/Source/GCC/startup_ARMCM3.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM3.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM3 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM33/Source/GCC/startup_ARMCM33.S b/Device/ARM/ARMCM33/Source/GCC/startup_ARMCM33.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM33.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM33 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S b/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM35P.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM35P Device
- * @version  V5.4.1
- * @date     03. September 2018
+ * @version  V1.0.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.c b/Device/ARM/ARMCM35P/Source/GCC/startup_ARMCM35P.c
@@ -3,10 +3,10 @@
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM35P Device
  * @version  V1.0.0
- * @date     03. September 2018
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM4/Source/GCC/startup_ARMCM4.S b/Device/ARM/ARMCM4/Source/GCC/startup_ARMCM4.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM4.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM4 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMCM7/Source/GCC/startup_ARMCM7.S b/Device/ARM/ARMCM7/Source/GCC/startup_ARMCM7.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMCM7.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMCM7 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMSC000/Source/GCC/startup_ARMSC000.S b/Device/ARM/ARMSC000/Source/GCC/startup_ARMSC000.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMSC000.s
  * @brief    CMSIS Core Device Startup File for
  *           ARMSC000 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMSC300/Source/GCC/startup_ARMSC300.S b/Device/ARM/ARMSC300/Source/GCC/startup_ARMSC300.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMSC300.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMSC300 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMv8MBL/Source/GCC/startup_ARMv8MBL.S b/Device/ARM/ARMv8MBL/Source/GCC/startup_ARMv8MBL.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMv8MBL.S
  * @brief    CMSIS Core Device Startup File for
  *           ARMv8MBL Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/ARM/ARMv8MML/Source/GCC/startup_ARMv8MML.S b/Device/ARM/ARMv8MML/Source/GCC/startup_ARMv8MML.S
@@ -2,11 +2,11 @@
  * @file     startup_ARMv8MML.s
  * @brief    CMSIS Core Device Startup File for
  *           ARMv8MML Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     23. January 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/Device/_Template_Vendor/Vendor/Device/Source/GCC/startup_Device.S b/Device/_Template_Vendor/Vendor/Device/Source/GCC/startup_Device.S
@@ -2,11 +2,11 @@
  * @file     startup_<Device>.S
  * @brief    CMSIS Cortex-M# Core Device Startup File for
  *           Device <Device>
- * @version  V5.3.1
- * @date     09. July 2018
+ * @version  V1.1.0
+ * @date     20. March 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -120,6 +120,8 @@ __Vectors_End:
                 .globl   Reset_Handler
                 .fnstart
 Reset_Handler:
+                bl       SystemInit
+
 /* Firstly it copies data from read only memory to RAM.
  * There are two schemes to copy. One can copy more than one sections.
  * Another can copy only one section. The former scheme needs more
@@ -238,7 +240,6 @@ Reset_Handler:
                 blt      .L_loop3
 #endif /* __STARTUP_CLEAR_BSS_MULTIPLE || __STARTUP_CLEAR_BSS */
 
-                bl       SystemInit
                 bl       _start
 
                 .fnend
diff --git a/Device/_Template_Vendor/Vendor/Device/Source/GCC/startup_Device.c b/Device/_Template_Vendor/Vendor/Device/Source/GCC/startup_Device.c
@@ -1,12 +1,12 @@
 /**************************************************************************//**
- * @file     startup_ARMCM3.c
- * @brief    CMSIS Core Device Startup File for
- *           ARMCM3 Device
- * @version  V5.3.1
- * @date     09. July 2018
+ * @file     startup_<device>.c
+ * @brief    CMSIS Cortex-M# Core Device Startup File for
+ *           Device <Device>
+ * @version  V1.1.0
+ * @date     20. March 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -27,7 +27,7 @@
 //-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
 */
 
-#include "ARMCM3.h"
+#include "<device>.h"
 
 
 /*----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ void Interrupt9_Handler     (void) __attribute__ ((weak, alias("Default_Handler"
   Exception / Interrupt Vector table
  *----------------------------------------------------------------------------*/
 extern const pFunc __Vectors[240];
-       const pFunc __Vectors[240] __attribute__ ((section(".vectors"))) = {
+       const pFunc __Vectors[240] __attribute__((used, section(".vectors"))) = {
   (pFunc)(&__StackTop),                     /*     Initial Stack Pointer */
   Reset_Handler,                            /*     Reset Handler */
   NMI_Handler,                              /* -14 NMI Handler */
@@ -152,6 +152,8 @@ void Reset_Handler(void) {
   uint32_t *pSrc, *pDest;
   uint32_t *pTable __attribute__((unused));
 
+  SystemInit();                             /* CMSIS System Initialization */
+
 /* Firstly it copies data from read only memory to RAM.
  * There are two schemes to copy. One can copy more than one sections.
  * Another can copy only one section. The former scheme needs more
@@ -239,7 +241,6 @@ void Reset_Handler(void) {
   }
 #endif /* __STARTUP_CLEAR_BSS_MULTIPLE || __STARTUP_CLEAR_BSS */
 
-  SystemInit();                             /* CMSIS System Initialization */
   _start();                                 /* Enter PreeMain (C library entry point) */
 }
 
diff --git 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.5.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.5.1.  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. 
 
