From bd92ca06faf62a9abdf96bfc8c4706b488f0a31e Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Wed, 24 Mar 2021 17:10:42 +0000 Subject: [PATCH 1/2] ARM_MUSCA_B1: default baud rate to 115200 The TF-M secure binary has a fixed baud rate of 115200. Having a different baud rate on the non-secure side results in broken serial outputs. --- platform/mbed_lib.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/mbed_lib.json b/platform/mbed_lib.json index 980a63b473d..756c1981d21 100644 --- a/platform/mbed_lib.json +++ b/platform/mbed_lib.json @@ -235,6 +235,10 @@ "crash-capture-enabled": true, "fatal-error-auto-reboot-enabled": true }, + "ARM_MUSCA_B1": { + "stdio-convert-newlines": true, + "stdio-baud-rate": 115200 + }, "ARM_MUSCA_S1": { "stdio-convert-newlines": true, "stdio-baud-rate": 115200 From c4178b4ce8ee6e11e1167a103eabe0e1cf4d54e4 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Wed, 24 Mar 2021 17:07:16 +0000 Subject: [PATCH 2/2] TF-M targets: Clean up RTOS configuration On Armv8 targets, the PSA interface on the non-secure side only requires mutexes, thus we remove other RTOS overrides to reduce memory usage in general use cases. TF-M and PSA test applications require more RTOS resources, and they have their own configurations defined in mbed-os-tf-m-regression-tests. This commit also adds missing configuration for ARM_MUSCA_B1. --- cmsis/device/rtos/mbed_lib.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmsis/device/rtos/mbed_lib.json b/cmsis/device/rtos/mbed_lib.json index 46bc00ce052..b1e1a7e0f67 100644 --- a/cmsis/device/rtos/mbed_lib.json +++ b/cmsis/device/rtos/mbed_lib.json @@ -85,11 +85,11 @@ "MCU_PSOC6_M4": { "target.macros_add": ["CY_RTOS_AWARE"] }, + "ARM_MUSCA_B1": { + "mutex-num": 4 + }, "ARM_MUSCA_S1": { - "mutex-num": 4, - "semaphore-num": 4, - "thread-num": 9, - "thread-user-stack-size": 8096 + "mutex-num": 4 } } }