From 173e407fed87e1703e36f69c71f0566b33534058 Mon Sep 17 00:00:00 2001 From: Chun-Chieh Li Date: Wed, 13 Oct 2021 17:57:56 +0800 Subject: [PATCH] M2354: Fix stdin abnormal on NuMaker-IoT-M2354 with Mbed CLI Due to post-build script not supporting custom board, both the below UART configurations are enabled on NuMaker-IoT-M2354 board: - UART0 PA7/PA6 enabled by bl2.bin - UART0 PB9/PB8 enabled by tfm_s.bin and later by mbed Both PA7/PA6 and PB9/PB8 enabled on UART0, PB8 gets disturbed and stdin mis-behaves on NuMaker-IoT-M2354 board. NuMaker-M2354 : UART TX/RX = UART0 PA7/PA6 NuMaker-IoT_M2354 : UART TX/RX = UART0 PB9/PB8 This bugfix tries to enable post-build for custom board to some degree (not completely), with Mbed CLI. NOTE: For Mbed CLI, the build process still sees NuMaker-M2354's partition/ and applies its mcuboot build options. Custom board must align on these. --- tools/targets/NU_M2354.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/targets/NU_M2354.py b/tools/targets/NU_M2354.py index a6894a1814..bc69113487 100644 --- a/tools/targets/NU_M2354.py +++ b/tools/targets/NU_M2354.py @@ -27,7 +27,6 @@ from datetime import datetime SCRIPT_DIR = dirname(abspath(__file__)) MBED_OS_ROOT = abspath(path_join(SCRIPT_DIR, os.pardir, os.pardir)) -SECURE_ROOT = path_join(MBED_OS_ROOT, 'targets', 'TARGET_NUVOTON', 'TARGET_M2354', 'TARGET_TFM', 'TARGET_NU_M2354', 'COMPONENT_TFM_S_FW') def m2354_tfm_bin(t_self, non_secure_image, secure_bin): @@ -37,6 +36,8 @@ def m2354_tfm_bin(t_self, non_secure_image, secure_bin): secure_bin = abspath(secure_bin) non_secure_image = abspath(non_secure_image) + SECURE_ROOT = dirname(secure_bin) + build_dir = dirname(non_secure_image) tempdir = path_join(build_dir, 'temp') if not isdir(tempdir):