Skip to content

Commit 47c3197

Browse files
committed
Support RTOS-less secure image build with Cortex-M23/M33
1 parent 675528b commit 47c3197

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

cmsis/RTE_Components.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#define RTE_COMPONENTS_H
1818

1919
#define CMSIS_device_header <cmsis.h>
20-
#include "mbed_rtx_conf.h"
2120

2221
#endif
2322

cmsis/TARGET_CORTEX_M/mbed_tz_context.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,20 @@
3131
#include CMSIS_device_header
3232
#include "tz_context.h"
3333

34-
/// Number of process slots (threads may call secure library code)
35-
#ifndef TZ_PROCESS_STACK_SLOTS
36-
#define TZ_PROCESS_STACK_SLOTS 8U
34+
#ifndef MBED_CONF_TZ_PROCESS_STACK_SLOTS
35+
#define MBED_CONF_TZ_PROCESS_STACK_SLOTS 8
3736
#endif
3837

39-
/// Stack size of the secure library code
40-
#ifndef TZ_PROCESS_STACK_SIZE
41-
#define TZ_PROCESS_STACK_SIZE 256U
38+
#ifndef MBED_CONF_TZ_PROCESS_STACK_SIZE
39+
#define MBED_CONF_TZ_PROCESS_STACK_SIZE 512
4240
#endif
4341

42+
/// Number of process slots (threads may call secure library code)
43+
#define TZ_PROCESS_STACK_SLOTS MBED_CONF_TZ_PROCESS_STACK_SLOTS
44+
45+
/// Stack size of the secure library code
46+
#define TZ_PROCESS_STACK_SIZE MBED_CONF_TZ_PROCESS_STACK_SIZE
47+
4448
typedef struct {
4549
uint32_t sp_top; // stack space top
4650
uint32_t sp_limit; // stack space limit

rtos/TARGET_CORTEX/mbed_rtx_conf.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,4 @@
5757
#define OS_IDLE_THREAD_TZ_MOD_ID 1
5858
#define OS_TIMER_THREAD_TZ_MOD_ID 1
5959

60-
#ifndef MBED_CONF_TZ_PROCESS_STACK_SIZE
61-
#define MBED_CONF_TZ_PROCESS_STACK_SIZE 512
62-
#endif
63-
#ifndef MBED_CONF_TZ_PROCESS_STACK_SLOTS
64-
#define MBED_CONF_TZ_PROCESS_STACK_SLOTS 8
65-
#endif
66-
67-
#define TZ_PROCESS_STACK_SLOTS MBED_CONF_TZ_PROCESS_STACK_SLOTS
68-
#define TZ_PROCESS_STACK_SIZE MBED_CONF_TZ_PROCESS_STACK_SIZE
69-
7060
#endif /* MBED_RTX_CONF_H */

0 commit comments

Comments
 (0)