Merge pull request #935 from fpistm/MP1Update

[MP1] Cube update

cores/arduino/stm32/LL/stm32yyxx_ll.h

@@ -16,8 +16,8 @@
 #include "stm32yyxx_ll_crs.h"
 #include "stm32yyxx_ll_dac.h"
 #include "stm32yyxx_ll_delayblock.h"
-#include "stm32yyxx_ll_dma.h"
 #include "stm32yyxx_ll_dma2d.h"
+#include "stm32yyxx_ll_dma.h"
 #include "stm32yyxx_ll_dmamux.h"
 #include "stm32yyxx_ll_exti.h"
 #include "stm32yyxx_ll_fmac.h"

cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h

@@ -41,6 +41,9 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_ll_cortex.h"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_ll_cortex.h"
+#endif
 #ifdef STM32WBxx
 #include "stm32wbxx_ll_cortex.h"
 #endif

cores/arduino/stm32/LL/stm32yyxx_ll_fmc.h

@@ -23,5 +23,8 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_ll_fmc.h"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_ll_fmc.h"
+#endif
 #pragma GCC diagnostic pop
 #endif /* _STM32YYXX_LL_FMC_H_ */

cores/arduino/stm32/LL/stm32yyxx_ll_rtc.h

@@ -41,6 +41,9 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_ll_rtc.h"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_ll_rtc.h"
+#endif
 #ifdef STM32WBxx
 #include "stm32wbxx_ll_rtc.h"
 #endif

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c

@@ -34,6 +34,9 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_hal_rtc.c"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_hal_rtc.c"
+#endif
 #ifdef STM32WBxx
 #include "stm32wbxx_hal_rtc.c"
 #endif

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c

@@ -34,6 +34,9 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_hal_rtc_ex.c"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_hal_rtc_ex.c"
+#endif
 #ifdef STM32WBxx
 #include "stm32wbxx_hal_rtc_ex.c"
 #endif

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c

@@ -25,3 +25,6 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_hal_sram.c"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_hal_sram.c"
+#endif

libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c

@@ -16,3 +16,6 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_ll_fmc.c"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_ll_fmc.c"
+#endif

libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c

@@ -34,6 +34,9 @@
 #ifdef STM32L4xx
 #include "stm32l4xx_ll_rtc.c"
 #endif
+#ifdef STM32MP1xx
+#include "stm32mp1xx_ll_rtc.c"
+#endif
 #ifdef STM32WBxx
 #include "stm32wbxx_ll_rtc.c"
 #endif

libraries/SrcWrapper/src/stm32/clock.c

@@ -43,16 +43,6 @@
 extern "C" {
 #endif
 
-#if defined(STM32MP1xx)
-#include "stm32mp1xx_hal.h"
-/* STM32MP1xx does not have own stm32mp1xx_ll_cortex.h so define functions manually.
- */
-__STATIC_INLINE uint32_t LL_SYSTICK_IsActiveCounterFlag(void)
-{
-  return ((SysTick->CTRL & SysTick_CTRL_COUNTFLAG_Msk) == (SysTick_CTRL_COUNTFLAG_Msk));
-}
-#endif
-
 /**
   * @brief  Function called to read the current micro second
   * @param  None

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

@@ -8,37 +8,21 @@
   *          is using in the C source code, usually in main.c. This file contains:
   *           - Configuration section that allows to select:
   *              - The STM32MP1xx device used in the target application
-  *              - To use or not the peripheral�s drivers in application code(i.e.
-  *                code will be based on direct access to peripheral�s registers
+  *              - To use or not the peripheral’s drivers in application code(i.e.
+  *                code will be based on direct access to peripheral’s registers
   *                rather than drivers API), this option is controlled by
   *                "#define USE_HAL_DRIVER"
   *
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
   *
-  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
   *
   ******************************************************************************
   */
@@ -86,7 +70,7 @@
   * @brief CMSIS Device version number
   */
 #define __STM32MP1xx_CMSIS_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __STM32MP1xx_CMSIS_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __STM32MP1xx_CMSIS_VERSION_SUB1   (0x02U) /*!< [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)\
@@ -108,14 +92,26 @@
   #include "stm32mp157axx_cm4.h"
 #elif defined(STM32MP157Cxx)
   #include "stm32mp157cxx_cm4.h"
+#elif defined(STM32MP157Dxx)
+  #include "stm32mp157dxx_cm4.h"
+#elif defined(STM32MP157Fxx)
+  #include "stm32mp157fxx_cm4.h"
 #elif defined(STM32MP153Axx)
   #include "stm32mp153axx_cm4.h"
 #elif defined(STM32MP153Cxx)
   #include "stm32mp153cxx_cm4.h"
+#elif defined(STM32MP153Dxx)
+  #include "stm32mp153dxx_cm4.h"
+#elif defined(STM32MP153Fxx)
+  #include "stm32mp153fxx_cm4.h"
 #elif defined(STM32MP151Axx)
   #include "stm32mp151axx_cm4.h"
 #elif defined(STM32MP151Cxx)
   #include "stm32mp151cxx_cm4.h"
+#elif defined(STM32MP151Dxx)
+  #include "stm32mp151dxx_cm4.h"
+#elif defined(STM32MP151Fxx)
+  #include "stm32mp151fxx_cm4.h"
 #else
  #error "Please select first the target STM32MP1xx device used in your application (in stm32mp1xx.h file)"
 #endif
@@ -128,14 +124,26 @@
   #include "stm32mp157axx_ca7.h"
 #elif defined(STM32MP157Cxx)
   #include "stm32mp157cxx_ca7.h"
+#elif defined(STM32MP157Dxx)
+  #include "stm32mp157dxx_ca7.h"
+#elif defined(STM32MP157Fxx)
+  #include "stm32mp157fxx_ca7.h"
 #elif defined(STM32MP153Axx)
   #include "stm32mp153axx_ca7.h"
 #elif defined(STM32MP153Cxx)
   #include "stm32mp153cxx_ca7.h"
+#elif defined(STM32MP153Dxx)
+  #include "stm32mp153dxx_ca7.h"
+#elif defined(STM32MP153Fxx)
+  #include "stm32mp153fxx_ca7.h"
 #elif defined(STM32MP151Axx)
   #include "stm32mp151axx_ca7.h"
 #elif defined(STM32MP151Cxx)
   #include "stm32mp151cxx_ca7.h"
+#elif defined(STM32MP151Dxx)
+  #include "stm32mp151dxx_ca7.h"
+#elif defined(STM32MP151Fxx)
+  #include "stm32mp151fxx_ca7.h"
 #else
  #error "Please select first the target STM32MP1xx device used in your application (in stm32mp1xx.h file)"
 #endif

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

@@ -6,29 +6,13 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
   *
-  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
   *
   ******************************************************************************
   */

system/Drivers/CMSIS/Device/ST/STM32MP1xx/Release_Notes.html

@@ -163,15 +163,16 @@ <h2>License</h2>
 </div>
 <div id="release_container" class="topic1">
 <div class="topic2" id="identification">
-<h3 style="width: 230px;">V1.1.1 / 14-November-2019</h3>
+<h3 style="width: 230px;">V1.2.0 / 03-Feb-2020</h3>
 </div>
 <div style="margin-left: 20px; width: 974px;" class="topic3" id="changes">
-<h4>Main changes</h4><ul><li><span style="font-family: Verdana,sans-serif; font-size: 10pt;"><span style="font-weight: bold;">Patch release to fix known defects&nbsp;</span></span></li><ul><li><span style="font-family: Verdana,sans-serif; font-size: 10pt;"><span style="font-weight: bold;"></span></span>Align Header file with TIM driver ( Break Source definition)</li><li>Update Linker Template file to define OpenAMP region ( for EWARM and MDK_ARM)</li></ul></ul>
+<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>
 </div>
 <div class="topic3" id="contents">
 <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><ul>
+<li>CMSIS devices files for:</li><ul><li>STM32MP<span style="font-weight: bold;">151C</span>xx ,STM32MP<span style="font-weight: bold;">151A</span>xx, STM32MP<span style="font-weight: bold;">151D</span>xx ,STM32MP<span style="font-weight: bold;">151F</span>xx</li><li>STM32MP<span style="font-weight: bold;">153C</span>xx ,STM32MP<span style="font-weight: bold;">153A</span>xx, STM32MP<span style="font-weight: bold;">153D</span>xx ,STM32MP<span style="font-weight: bold;">153F</span>xx</li><li>STM32MP<span style="font-weight: bold;">157C</span>xx ,STM32MP<span style="font-weight: bold;">157A</span>xx, STM32MP<span style="font-weight: bold;">157D</span>xx ,STM32MP<span style="font-weight: bold;">157F</span>xx</li></ul></ul><ul>
 </ul>
 </div>
 </div>
@@ -180,7 +181,7 @@ <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-September-2019</span><br></h3><div style="margin-left: 40px; width: 954px;" class="topic3" id="changes">
+<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>

system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md

@@ -12,7 +12,7 @@
   * STM32L0: 1.9.0
   * STM32L1: 2.3.0
   * STM32L4: 1.6.0
-  * STM32MP1: 1.1.1
+  * STM32MP1: 1.2.0
   * STM32WB: 1.3.0
 
 Release notes of each STM32YYxx CMSIS available here: