ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13400 from gbrtth/boot_sequence_fix 

Call mbed_tfm_init before mbed_toolchain_init
pull/13584/head
Martin Kojtal 2020-09-10 09:23:43 +01:00 committed by GitHub
parent 3b5ab54618 656e046113
commit 5940b1670c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmsis/device/rtos/include/mbed_boot.h
View File

@ -134,6 +134,8 @@ MBED_NORETURN void mbed_rtos_start(void);
*
* Preconditions:
* - The RTOS has been started by a call to mbed_rtos_start
* - If the platform is supported by TF-M, initialization
* has been done by a call to mbed_tfm_init
*/
void mbed_toolchain_init(void);
@ -160,7 +162,6 @@ void mbed_sdk_init(void);
*
* Preconditions:
* - The RTOS has been started by a call to mbed_rtos_start
* - The toolchain has been initialized by a call to mbed_toolchain_init
*/
void mbed_tfm_init(void);

2
cmsis/device/rtos/source/mbed_boot.c
View File

@ -95,8 +95,8 @@ void mbed_init(void)
void mbed_start(void)
{
mbed_rtos_init_singleton_mutex();
mbed_toolchain_init();
mbed_tfm_init();
mbed_toolchain_init();
mbed_main();
mbed_error_initialize();
main();