Skip to content

Commit b1aeb25

Browse files
authored
Merge pull request #1230 from fpistm/updateMP1
Update STM32MP1 HAL and CMSIS drivers
2 parents 035bfa3 + 2375e8c commit b1aeb25

File tree

72 files changed

+266899
-80778
lines changed

Some content is hidden

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

72 files changed

+266899
-80778
lines changed

CI/utils/stm32wrapper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ def printCMSISStartup(log):
131131
# File name
132132
fn = os.path.basename(fp)
133133
valueline = re.split("_|\\.", fn)
134-
upper = (
135-
valueline[1].upper().replace("X", "x").replace("MP15xx", "MP1xx")
136-
)
134+
if "stm32mp15" in valueline[1] and not valueline[1].endswith("xx"):
135+
valueline[1] += "xx"
136+
upper = valueline[1].upper().replace("X", "x")
137137
out_file.write(
138138
""" #elif defined({})
139139
#define CMSIS_STARTUP_FILE \"{}\"

cores/arduino/stm32/stm32_def_build.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,19 @@
378378
#define CMSIS_STARTUP_FILE "startup_stm32l4s7xx.s"
379379
#elif defined(STM32L4S9xx)
380380
#define CMSIS_STARTUP_FILE "startup_stm32l4s9xx.s"
381-
#elif defined(STM32MP1xx)
381+
#elif defined(STM32MP151Axx)
382+
#define CMSIS_STARTUP_FILE "startup_stm32mp151a_cm4 .s"
383+
#elif defined(STM32MP151Cxx)
384+
#define CMSIS_STARTUP_FILE "startup_stm32mp151c_cm4.s"
385+
#elif defined(STM32MP153Axx)
386+
#define CMSIS_STARTUP_FILE "startup_stm32mp153a_cm4.s"
387+
#elif defined(STM32MP153Cxx)
388+
#define CMSIS_STARTUP_FILE "startup_stm32mp153c_cm4.s"
389+
#elif defined(STM32MP157Axx)
390+
#define CMSIS_STARTUP_FILE "startup_stm32mp157a_cm4.s"
391+
#elif defined(STM32MP157Cxx)
392+
#define CMSIS_STARTUP_FILE "startup_stm32mp157c_cm4.s"
393+
#elif defined(STM32MP15xx)
382394
#define CMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
383395
#elif defined(STM32WB30xx)
384396
#define CMSIS_STARTUP_FILE "startup_stm32wb30xx_cm4.s"

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
#ifdef STM32L4xx
3535
#include "stm32l4xx_hal_smartcard.c"
3636
#endif
37+
#ifdef STM32MP1xx
38+
#include "stm32mp1xx_hal_smartcard.c"
39+
#endif
3740
#ifdef STM32WBxx
3841
#include "stm32wbxx_hal_smartcard.c"
3942
#endif

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#ifdef STM32L4xx
2323
#include "stm32l4xx_hal_smartcard_ex.c"
2424
#endif
25+
#ifdef STM32MP1xx
26+
#include "stm32mp1xx_hal_smartcard_ex.c"
27+
#endif
2528
#ifdef STM32WBxx
2629
#include "stm32wbxx_hal_smartcard_ex.c"
2730
#endif

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

Lines changed: 10609 additions & 3225 deletions
Large diffs are not rendered by default.

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

Lines changed: 10607 additions & 3223 deletions
Large diffs are not rendered by default.

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

Lines changed: 10612 additions & 3240 deletions
Large diffs are not rendered by default.

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

Lines changed: 10610 additions & 3238 deletions
Large diffs are not rendered by default.

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

Lines changed: 10609 additions & 3225 deletions
Large diffs are not rendered by default.

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

Lines changed: 10607 additions & 3223 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)