Skip to content

Commit 42dfb63

Browse files
authored
Merge pull request #1892 from fpistm/update_CubeL5
Update STM32L5 HAL and CMSIS drivers
2 parents cd80a53 + 99dd21b commit 42dfb63

File tree

238 files changed

+13501
-9299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+13501
-9299
lines changed

Diff for: system/Drivers/CMSIS/Device/ST/STM32L5xx/Include/Templates/partition_stm32l552xx.h

+12-19
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,18 @@
1111
* - Setup behavior of Floating Point Unit
1212
* - Setup Interrupt Target
1313
*
14-
******************************************************************************/
15-
/*
16-
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17-
* Portions Copyright (c) 2019 STMicroelectronics, all rights reserved
18-
*
19-
* SPDX-License-Identifier: Apache-2.0
20-
*
21-
* Licensed under the Apache License, Version 2.0 (the License); you may
22-
* not use this file except in compliance with the License.
23-
* You may obtain a copy of the License at
24-
*
25-
* http://www.apache.org/licenses/LICENSE-2.0
26-
*
27-
* Unless required by applicable law or agreed to in writing, software
28-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30-
* See the License for the specific language governing permissions and
31-
* limitations under the License.
32-
*/
14+
******************************************************************************
15+
* @attention
16+
*
17+
* Copyright (c) 2019 STMicroelectronics.
18+
* All rights reserved.
19+
*
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
23+
*
24+
******************************************************************************
25+
*/
3326

3427

3528
#ifndef PARTITION_STM32L552XX_H

Diff for: system/Drivers/CMSIS/Device/ST/STM32L5xx/Include/Templates/partition_stm32l562xx.h

+12-19
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,18 @@
1111
* - Setup behavior of Floating Point Unit
1212
* - Setup Interrupt Target
1313
*
14-
******************************************************************************/
15-
/*
16-
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17-
* Portions Copyright (c) 2019 STMicroelectronics, all rights reserved
18-
*
19-
* SPDX-License-Identifier: Apache-2.0
20-
*
21-
* Licensed under the Apache License, Version 2.0 (the License); you may
22-
* not use this file except in compliance with the License.
23-
* You may obtain a copy of the License at
24-
*
25-
* http://www.apache.org/licenses/LICENSE-2.0
26-
*
27-
* Unless required by applicable law or agreed to in writing, software
28-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30-
* See the License for the specific language governing permissions and
31-
* limitations under the License.
32-
*/
14+
******************************************************************************
15+
* @attention
16+
*
17+
* Copyright (c) 2019 STMicroelectronics.
18+
* All rights reserved.
19+
*
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
23+
*
24+
******************************************************************************
25+
*/
3326

3427
#ifndef PARTITION_STM32L562XX_H
3528
#define PARTITION_STM32L562XX_H

Diff for: system/Drivers/CMSIS/Device/ST/STM32L5xx/Include/partition_stm32l5xx.h

+10-12
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
******************************************************************************
1414
* @attention
1515
*
16-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
17-
* All rights reserved.</center></h2>
16+
* Copyright (c) 2019 STMicroelectronics.
17+
* All rights reserved.
1818
*
19-
* This software component is licensed by ST under Apache License, Version 2.0,
20-
* the "License"; You may not use this file except in compliance with the
21-
* License. You may obtain a copy of the License at:
22-
* opensource.org/licenses/Apache-2.0
19+
* This software is licensed under terms that can be found in the LICENSE file
20+
* in the root directory of this software component.
21+
* If no LICENSE file comes with this software, it is provided AS-IS.
2322
*
2423
******************************************************************************
2524
*/
@@ -49,23 +48,22 @@
4948
#include "partition_stm32l562xx.h"
5049
#else
5150
#error "Please select first the target STM32L5xx device used in your application (in stm32l5xx.h file)"
52-
#endif
51+
#endif /* STM32L552xx */
5352

53+
/**
54+
* @}
55+
*/
5456

5557
#ifdef __cplusplus
5658
}
5759
#endif /* __cplusplus */
5860

5961
#endif /* PARTITION_STM32L5XX_H */
62+
6063
/**
6164
* @}
6265
*/
6366

6467
/**
6568
* @}
6669
*/
67-
68-
69-
70-
71-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: system/Drivers/CMSIS/Device/ST/STM32L5xx/Include/stm32l552xx.h

+19-16
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripherals registers hardware
10+
* - Macros to access peripheral's registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2019 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under Apache License, Version 2.0,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/Apache-2.0
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -44,7 +43,10 @@ extern "C" {
4443
* @{
4544
*/
4645

47-
46+
/**
47+
* @brief stm32l552xx Interrupt Number Definition, according to the selected device
48+
* in @ref Library_configuration_section
49+
*/
4850

4951
/* =========================================================================================================================== */
5052
/* ================ Interrupt Number Definition ================ */
@@ -212,11 +214,11 @@ typedef enum
212214
#define __FPU_PRESENT 1U /* FPU present */
213215
#define __DSP_PRESENT 1U /* DSP extension present */
214216

215-
/** @} */ /* End of group Configuration_of_CMSIS */
217+
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
218+
#include "system_stm32l5xx.h" /*!< STM32L5xx System */
216219

217220

218-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
219-
#include "system_stm32l5xx.h" /*!< STM32L5xx System */
221+
/** @} */ /* End of group Configuration_of_CMSIS */
220222

221223

222224
/* =========================================================================================================================== */
@@ -1300,7 +1302,7 @@ typedef struct
13001302
#pragma pop
13011303
#elif defined (__ICCARM__)
13021304
/* leave anonymous unions enabled */
1303-
#elif (__ARMCC_VERSION >= 6010050)
1305+
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
13041306
#pragma clang diagnostic pop
13051307
#elif defined (__GNUC__)
13061308
/* anonymous unions are enabled by default */
@@ -1714,12 +1716,12 @@ typedef struct
17141716

17151717
/**
17161718
* @brief Prototype of RSSLIB Close and exit HDP Function
1717-
* @detail This function close the requested hdp area passed in input
1719+
* @details This function close the requested hdp area passed in input
17181720
* parameter and jump to the reset handler present within the
17191721
* Vector table. The function does not return on successful execution.
17201722
* @param HdpArea notifies which hdp area to close, can be a combination of
17211723
* hdpa area 1 and hdp area 2
1722-
* @param pointer on the vector table containing the reset handler the function
1724+
* @param VectorTableAddr pointer on the vector table containing the reset handler the function
17231725
* jumps to.
17241726
* @retval RSSLIB_RSS_ERROR on error on input parameter, otherwise does not return.
17251727
*/
@@ -11024,6 +11026,9 @@ typedef struct
1102411026
/* Reset and Clock Control */
1102511027
/* */
1102611028
/******************************************************************************/
11029+
#define RCC_MAX_FREQUENCY 110000000U /*!< Max frequency of family in Hz*/
11030+
#define RCC_MAX_FREQUENCY_MHZ 110U /*!< Max frequency of family in MHz*/
11031+
1102711032
/******************** Bit definition for RCC_CR register ********************/
1102811033
#define RCC_CR_MSION_Pos (0U)
1102911034
#define RCC_CR_MSION_Msk (0x1UL << RCC_CR_MSION_Pos) /*!< 0x00000001 */
@@ -20394,5 +20399,3 @@ typedef struct
2039420399
#endif
2039520400

2039620401
#endif /* STM32L552xx_H */
20397-
20398-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: system/Drivers/CMSIS/Device/ST/STM32L5xx/Include/stm32l562xx.h

+19-16
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripherals registers hardware
10+
* - Macros to access peripheral's registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2019 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under Apache License, Version 2.0,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/Apache-2.0
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -44,7 +43,10 @@ extern "C" {
4443
* @{
4544
*/
4645

47-
46+
/**
47+
* @brief stm32l562xx Interrupt Number Definition, according to the selected device
48+
* in @ref Library_configuration_section
49+
*/
4850

4951
/* =========================================================================================================================== */
5052
/* ================ Interrupt Number Definition ================ */
@@ -215,11 +217,11 @@ typedef enum
215217
#define __FPU_PRESENT 1U /* FPU present */
216218
#define __DSP_PRESENT 1U /* DSP extension present */
217219

218-
/** @} */ /* End of group Configuration_of_CMSIS */
220+
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
221+
#include "system_stm32l5xx.h" /*!< STM32L5xx System */
219222

220223

221-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
222-
#include "system_stm32l5xx.h" /*!< STM32L5xx System */
224+
/** @} */ /* End of group Configuration_of_CMSIS */
223225

224226

225227
/* =========================================================================================================================== */
@@ -1374,7 +1376,7 @@ typedef struct
13741376
#pragma pop
13751377
#elif defined (__ICCARM__)
13761378
/* leave anonymous unions enabled */
1377-
#elif (__ARMCC_VERSION >= 6010050)
1379+
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
13781380
#pragma clang diagnostic pop
13791381
#elif defined (__GNUC__)
13801382
/* anonymous unions are enabled by default */
@@ -1802,12 +1804,12 @@ typedef struct
18021804

18031805
/**
18041806
* @brief Prototype of RSSLIB Close and exit HDP Function
1805-
* @detail This function close the requested hdp area passed in input
1807+
* @details This function close the requested hdp area passed in input
18061808
* parameter and jump to the reset handler present within the
18071809
* Vector table. The function does not return on successful execution.
18081810
* @param HdpArea notifies which hdp area to close, can be a combination of
18091811
* hdpa area 1 and hdp area 2
1810-
* @param pointer on the vector table containing the reset handler the function
1812+
* @param VectorTableAddr pointer on the vector table containing the reset handler the function
18111813
* jumps to.
18121814
* @retval RSSLIB_RSS_ERROR on error on input parameter, otherwise does not return.
18131815
*/
@@ -11727,6 +11729,9 @@ typedef struct
1172711729
/* Reset and Clock Control */
1172811730
/* */
1172911731
/******************************************************************************/
11732+
#define RCC_MAX_FREQUENCY 110000000U /*!< Max frequency of family in Hz*/
11733+
#define RCC_MAX_FREQUENCY_MHZ 110U /*!< Max frequency of family in MHz*/
11734+
1173011735
/******************** Bit definition for RCC_CR register ********************/
1173111736
#define RCC_CR_MSION_Pos (0U)
1173211737
#define RCC_CR_MSION_Msk (0x1UL << RCC_CR_MSION_Pos) /*!< 0x00000001 */
@@ -21195,5 +21200,3 @@ typedef struct
2119521200
#endif
2119621201

2119721202
#endif /* STM32L562xx_H */
21198-
21199-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)