Skip to content

Commit 5940b16

Browse files
authored
Merge pull request #13400 from gbrtth/boot_sequence_fix
Call mbed_tfm_init before mbed_toolchain_init
2 parents 3b5ab54 + 656e046 commit 5940b16

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmsis/device/rtos/include/mbed_boot.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ MBED_NORETURN void mbed_rtos_start(void);
134134
*
135135
* Preconditions:
136136
* - The RTOS has been started by a call to mbed_rtos_start
137+
* - If the platform is supported by TF-M, initialization
138+
* has been done by a call to mbed_tfm_init
137139
*/
138140
void mbed_toolchain_init(void);
139141

@@ -160,7 +162,6 @@ void mbed_sdk_init(void);
160162
*
161163
* Preconditions:
162164
* - The RTOS has been started by a call to mbed_rtos_start
163-
* - The toolchain has been initialized by a call to mbed_toolchain_init
164165
*/
165166
void mbed_tfm_init(void);
166167

cmsis/device/rtos/source/mbed_boot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ void mbed_init(void)
9595
void mbed_start(void)
9696
{
9797
mbed_rtos_init_singleton_mutex();
98-
mbed_toolchain_init();
9998
mbed_tfm_init();
99+
mbed_toolchain_init();
100100
mbed_main();
101101
mbed_error_initialize();
102102
main();

0 commit comments

Comments
 (0)