Merge pull request #9973 from kfnta/tfm_num_threads

Cruz Monrreal · web-flow · commit ff78bc4b7cc3 · 2019-03-07T10:28:11.000-06:00
TF-M config: Add max_ns_thread_count parameter
diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json
@@ -1,4 +1,11 @@
 {
     "name": "tfm-s",
-    "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"]
+    "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"],
+    "config": {
+        "max_ns_thread_count": {
+            "help": "maximum allowed number of non-secure threads",
+            "macro_name": "TFM_MAX_NS_THREAD_COUNT",
+            "value": 10
+        }
+    }
 }
diff --git a/features/storage/TESTS/blockdevice/general_block_device/main.cpp b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
@@ -51,7 +51,7 @@ using namespace utest::v1;
 
 #define TEST_BLOCK_COUNT 10
 #define TEST_ERROR_MASK 16
-#define TEST_NUM_OF_THREADS 4
+#define TEST_NUM_OF_THREADS 5
 #define TEST_THREAD_STACK_SIZE 1024
 
 const struct {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tfm-s",`
`3`		`- "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"]`
	`3`	`+ "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"],`
	`4`	`+ "config": {`
	`5`	`+ "max_ns_thread_count": {`
	`6`	`+ "help": "maximum allowed number of non-secure threads",`
	`7`	`+ "macro_name": "TFM_MAX_NS_THREAD_COUNT",`
	`8`	`+ "value": 10`
	`9`	`+ }`
	`10`	`+ }`
`4`	`11`	`}`