Skip to content

Call mbed_tfm_init before mbed_toolchain_init #13400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2020
Merged

Call mbed_tfm_init before mbed_toolchain_init #13400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmsis/device/rtos/include/mbed_boot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion cmsis/device/rtos/source/mbed_boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down