Merge pull request #1230 from fpistm/updateMP1

Update STM32MP1 HAL and CMSIS drivers

Author: fpistm

CI/utils/stm32wrapper.py

@@ -131,9 +131,9 @@ def printCMSISStartup(log):
                 # File name
                 fn = os.path.basename(fp)
                 valueline = re.split("_|\\.", fn)
-                upper = (
-                    valueline[1].upper().replace("X", "x").replace("MP15xx", "MP1xx")
-                )
+                if "stm32mp15" in valueline[1] and not valueline[1].endswith("xx"):
+                    valueline[1] += "xx"
+                upper = valueline[1].upper().replace("X", "x")
                 out_file.write(
                     """  #elif defined({})
     #define CMSIS_STARTUP_FILE \"{}\"

cores/arduino/stm32/stm32_def_build.h

@@ -378,7 +378,19 @@
     #define CMSIS_STARTUP_FILE "startup_stm32l4s7xx.s"
   #elif defined(STM32L4S9xx)
     #define CMSIS_STARTUP_FILE "startup_stm32l4s9xx.s"
-  #elif defined(STM32MP1xx)
+  #elif defined(STM32MP151Axx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp151a_cm4 .s"
+  #elif defined(STM32MP151Cxx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp151c_cm4.s"
+  #elif defined(STM32MP153Axx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp153a_cm4.s"
+  #elif defined(STM32MP153Cxx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp153c_cm4.s"
+  #elif defined(STM32MP157Axx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp157a_cm4.s"
+  #elif defined(STM32MP157Cxx)
+    #define CMSIS_STARTUP_FILE "startup_stm32mp157c_cm4.s"
+  #elif defined(STM32MP15xx)
     #define CMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
   #elif defined(STM32WB30xx)
     #define CMSIS_STARTUP_FILE "startup_stm32wb30xx_cm4.s"

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c

@@ -34,6 +34,9 @@
 #ifdef STM32L4xx
   #include "stm32l4xx_hal_smartcard.c"
 #endif
+#ifdef STM32MP1xx
+  #include "stm32mp1xx_hal_smartcard.c"
+#endif
 #ifdef STM32WBxx
   #include "stm32wbxx_hal_smartcard.c"
 #endif

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c

@@ -22,6 +22,9 @@
 #ifdef STM32L4xx
   #include "stm32l4xx_hal_smartcard_ex.c"
 #endif
+#ifdef STM32MP1xx
+  #include "stm32mp1xx_hal_smartcard_ex.c"
+#endif
 #ifdef STM32WBxx
   #include "stm32wbxx_hal_smartcard_ex.c"
 #endif

system/Drivers/CMSIS/Device/ST/STM32MP1xx/Include/stm32mp151axx_ca7.h

@@ -70,7 +70,7 @@
   * @brief CMSIS Device version number
   */
 #define __STM32MP1xx_CMSIS_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __STM32MP1xx_CMSIS_VERSION_SUB1   (0x02U) /*!< [23:16] sub1 version */
+#define __STM32MP1xx_CMSIS_VERSION_SUB1   (0x03U) /*!< [23:16] sub1 version */
 #define __STM32MP1xx_CMSIS_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __STM32MP1xx_CMSIS_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 #define __STM32MP1xx_CMSIS_VERSION        ((__CMSIS_DEVICE_VERSION_MAIN     << 24)\

system/Drivers/CMSIS/Device/ST/STM32MP1xx/Include/stm32mp151axx_cm4.h

@@ -163,11 +163,11 @@ <h2>License</h2>
 </div>
 <div id="release_container" class="topic1">
 <div class="topic2" id="identification">
-<h3 style="width: 230px;">V1.2.0 / 03-Feb-2020</h3>
+<h3 style="width: 230px;">V1.3.0 / 20-oct-2020</h3>
 </div>
 <div style="margin-left: 20px; width: 974px;" class="topic3" id="changes">
 <h4>Main changes</h4>
-<ul><li>Header files:&nbsp;</li><ul><li>Add new Part Number for 800MHz</li><li>Update license with BSD 3-Clause template</li><li>Rework CMSIS for RTC/TAMP, GPIO and TIM</li><li>Rename TIM Break source bit definition</li></ul></ul><ul><li>Update Linker Template&nbsp;file for KEIL and IAR:</li><ul><li>Add OpenAMP region ( region present by default, to comment if needed )</li></ul></ul><br>
+<ul><li>Header files:&nbsp;</li><ul><li>Rename&nbsp;&nbsp;RCC bit definition&nbsp;to be more compliant with the name from RCC spec</li></ul></ul><ul><ul><li>Update STGEN register structure</li><li>Fix typo in MDMA register definition</li></ul></ul><br>
 </div>
 <div class="topic3" id="contents">
 <h4>Contents</h4>
@@ -181,7 +181,13 @@ <h4>Contents</h4>
 </div>
 <div id="history" class="topic1" hidden="">
 <h2>Update History</h2>
-<br><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; margin-left: 26px; width: 174px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V1.1.0 / 10-Sept-2019</span><br></h3><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
+<br><br><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; margin-left: 26px; width: 174px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V1.2.0 / 03-Feb-2020</span><br></h3><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
+<h4>Main changes</h4>
+<ul><li>Header files:&nbsp;</li><ul><li>Add new Part Number for 800MHz</li><li>Update license with BSD 3-Clause template</li><li>Rework CMSIS for RTC/TAMP, GPIO and TIM</li><li>Rename TIM Break source bit definition</li></ul><li>Update Linker Template&nbsp;file for KEIL and IAR:</li><ul><li>Add OpenAMP region ( region present by default, to comment if needed )</li></ul></ul></div><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
+<h4>Contents</h4>
+<ul><li>CMSIS devices files for STM32MP<span style="font-weight: bold;">151C</span>xx ,STM32MP<span style="font-weight: bold;">151A</span>xx, STM32MP<span style="font-weight: bold;">153C</span>xx, STM32MP<span style="font-weight: bold;">153A</span>xx, STM32MP<span style="font-weight: bold;">157C</span>xx ,STM32MP<span style="font-weight: bold;">157A</span>xx</li></ul>
+<br>
+</div><br><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; margin-left: 26px; width: 174px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V1.1.0 / 10-Sept-2019</span><br></h3><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
 <h4>Main changes</h4>
 <ul><li>Header files:&nbsp;</li><ul><li>Update FMC bit definition</li><li>Update ETH&nbsp;bit definition</li><li>update EXTI_EXTICR&nbsp;bit definition</li><li>Update I2C&nbsp;bit definition</li><li>Update SPI&nbsp;bit definition (SPI_CR1_CRC33_17, SPI_RXCRC, SPI_IER, SPI_I2SCFGR)&nbsp;</li><li>TMPSENS IP renamed DTS</li><li>Update FDCAN TXBC&nbsp;bit definition</li><li>Update DAC_DHR8RD&nbsp;bit definition</li><li>Add CRYP in STM32MP151Cx and STM32MP153Cx</li><li>Update TIM / LPTIM&nbsp;bit definition + add missing macros</li></ul><li>Update system_stm32mp1xx.c</li><ul><li>Update SystemCoreClock</li></ul><li>Update startup file for KEIL and IAR</li></ul></div><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
 <h4>Contents</h4>