ARMmbed · cmonr · Jul 18, 2018 · Jun 30, 2017 · Jul 4, 2017 · Jul 4, 2017
diff --git a/TESTS/mbedmicro-rtos-mbed/basic/main.cpp b/TESTS/mbedmicro-rtos-mbed/basic/main.cpp
@@ -29,7 +29,11 @@
 
 using utest::v1::Case;
 
+#if defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define TEST_STACK_SIZE 512
+#else
 #define TEST_STACK_SIZE 256
+#endif
 #define ONE_MILLI_SEC 1000
 
 volatile uint32_t elapsed_time_ms = 0;

diff --git a/TESTS/mbedmicro-rtos-mbed/event_flags/main.cpp b/TESTS/mbedmicro-rtos-mbed/event_flags/main.cpp
@@ -30,7 +30,11 @@ using utest::v1::Case;
   #error [NOT_SUPPORTED] test not supported
 #endif
 
+#if defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define THREAD_STACK_SIZE   512
+#else
 #define THREAD_STACK_SIZE   320 /* 512B stack on GCC_ARM compiler cause out of memory on some 16kB RAM boards e.g. NUCLEO_F070RB */
+#endif
 
 #define MAX_FLAG_POS 30
 #define PROHIBITED_FLAG_POS 31

diff --git a/TESTS/mbedmicro-rtos-mbed/mail/main.cpp b/TESTS/mbedmicro-rtos-mbed/mail/main.cpp
@@ -29,7 +29,11 @@
 
 using namespace utest::v1;
 
+#if defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define THREAD_STACK_SIZE   512
+#else
 #define THREAD_STACK_SIZE   320 /* larger stack cause out of heap memory on some 16kB RAM boards in multi thread test*/
+#endif
 #define QUEUE_SIZE          16
 #define THREAD_1_ID         1
 #define THREAD_2_ID         2

diff --git a/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp b/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
@@ -37,6 +37,8 @@ volatile bool thread_should_continue = true;
 
 #if defined(__CORTEX_A9)
 #define THREAD_STACK_SIZE   512
+#elif defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define THREAD_STACK_SIZE   512
 #else
 #define THREAD_STACK_SIZE   256
 #endif

diff --git a/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp b/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
@@ -29,7 +29,11 @@
 
 using namespace utest::v1;
 
+#if defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define TEST_STACK_SIZE 768
+#else
 #define TEST_STACK_SIZE 512
+#endif
 
 #define TEST_LONG_DELAY 20
 #define TEST_DELAY 10

diff --git a/TESTS/mbedmicro-rtos-mbed/threads/main.cpp b/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
@@ -32,6 +32,8 @@
 #define THREAD_STACK_SIZE 512
 #if defined(__CORTEX_A9)
 #define PARALLEL_THREAD_STACK_SIZE 512
+#elif defined(__CORTEX_M23) || defined(__CORTEX_M33)
+#define PARALLEL_THREAD_STACK_SIZE 512
 #else
 #define PARALLEL_THREAD_STACK_SIZE 384
 #endif

diff --git a/features/nvstore/TESTS/nvstore/functionality/main.cpp b/features/nvstore/TESTS/nvstore/functionality/main.cpp
@@ -43,9 +43,13 @@ static const int thr_test_num_secs = 5;
 static const int thr_test_max_data_size = 32;
 static const int thr_test_num_threads = 3;
 
+#if defined(__CORTEX_M23) || defined(__CORTEX_M33)
+static const int thr_test_min_stack_size = 1280;
+static const int thr_test_max_stack_size = 1280;
+#else
 static const int thr_test_min_stack_size = 768;
 static const int thr_test_max_stack_size = 1024;
-
+#endif
 
 typedef struct {
     uint8_t *buffs[max_test_keys][thr_test_num_buffs];

diff --git a/rtos/TARGET_CORTEX/mbed_boot.c b/rtos/TARGET_CORTEX/mbed_boot.c
@@ -321,6 +321,12 @@ void mbed_start_main(void)
     _main_thread_attr.cb_mem = &_main_obj;
     _main_thread_attr.priority = osPriorityNormal;
     _main_thread_attr.name = "main_thread";
+
+    /* Allow non-secure main thread to call secure functions */
+#if defined(DOMAIN_NS) && (DOMAIN_NS == 1U)
+    _main_thread_attr.tz_module = 1U;
+#endif
+
     osThreadId_t result = osThreadNew((osThreadFunc_t)pre_main, NULL, &_main_thread_attr);
     if ((void *)result == NULL) {
         MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_CODE_INITIALIZATION_FAILED), "Pre main thread not created", &_main_thread_attr);