From bbc5ad9505f1171de1e8c23206612174169f8ead Mon Sep 17 00:00:00 2001 From: Chun-Chieh Li Date: Thu, 16 Sep 2021 17:49:44 +0800 Subject: [PATCH] M2354: Fix TF-M 1.4 1. In TF-M, fix NSPE interrupt-disabled NSC call broken. Check: https://developer.trustedfirmware.org/T966 2. In TF-M, enable mcuboot log enabled forcibly. This is to help check firmware update process. 3. Update readme and script --- .../COMPONENT_TFM_S_FW/README.md | 7 ++++--- .../COMPONENT_TFM_S_FW/bl2.bin | Bin 30548 -> 36532 bytes .../COMPONENT_TFM_S_FW/tfm_s.axf | Bin 382604 -> 382604 bytes .../COMPONENT_TFM_S_FW/tfm_s.bin | Bin 323872 -> 323872 bytes targets/TARGET_NUVOTON/scripts/NUVOTON.py | 2 +- tools/targets/NU_M2354.py | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/README.md b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/README.md index 542bd75b445..5b03c916e63 100644 --- a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/README.md +++ b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/README.md @@ -5,12 +5,12 @@ This document guides how to rebuild TF-M and integrate with Mbed for M2354. ### Downloading TF-M source The M2354 port in TF-M must patch to enable TF-M integration with Mbed. -For TF-M 1.3/Mbed integration for M2354, the [mainstream TF-M](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git) is patched as follows: +For TF-M 1.4/Mbed integration for M2354, the [mainstream TF-M](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git) is patched as follows: - Apply Mbed-enabled patch to `nuvoton/m2354` TF-M target. Run the following command to fetch and switch to the intended version: ``` -$ git clone https://github.com/OpenNuvoton/trusted-firmware-m -b nuvoton_mbed_m2354_tfm-1.3 +$ git clone https://github.com/OpenNuvoton/trusted-firmware-m -b nuvoton_mbed_m2354_tfm-1.4 ``` ## Customizing TF-M @@ -96,7 +96,7 @@ $ cmake -S . \ -DTFM_PLATFORM=nuvoton/m2354 \ -DTFM_TOOLCHAIN_FILE=toolchain_GNUARM.cmake \ -DTFM_PSA_API=ON \ --DTFM_ISOLATION_LEVEL=2 \ +-DCMAKE_BUILD_TYPE=Release \ -G"Unix Makefiles" ``` @@ -132,6 +132,7 @@ The following TF-M exported stuffs must update into Mbed: Below summarize the copy paths from TF-M into Mbed: - trusted-firmware-m/cmake_build/install/outputs/NUVOTON/M2354/bl2.bin → bl2.bin +- trusted-firmware-m/cmake_build/install/outputs/NUVOTON/M2354/tfm_s.axf → tfm_s.axf - trusted-firmware-m/cmake_build/install/outputs/NUVOTON/M2354/tfm_s.bin → tfm_s.bin - trusted-firmware-m/cmake_build/install/interface/lib/s_veneers.o → s_veneers.o - trusted-firmware-m/platform/ext/target/nuvoton/m2354/partition/flash_layout.h → partition/flash_layout.h diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/bl2.bin b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/bl2.bin index aa9c12b004680270b946aa9744eae4002cfd0cbb..3fdad3bd31601812274a593ed36e288ced9b405f 100644 GIT binary patch delta 11646 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 YLTdR6jTMidzutcsKULSW)4z)UUnaw#zyJUM diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/tfm_s.axf b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/tfm_s.axf index 2169bd346dc74513b8e0eb61f82bab6cc67eff7d..4c8e693f1cc7ec8b967c3a6bf3d4ab9ef547c0dc 100644 GIT binary patch delta 684 zcmeBKE8eqKd_&kFrc2Dt5r^6%4l!vSa2MFhSJUO0kT7;FZ{tQ&KNTN;tytFR)`3Y2@-kvgIO9# zLFI8#!mJWtV`_hbRnPp%EDtj6C&IL!%F1%L)PB83k~+y^8+{oyxedAThh1AzeKXGcDP7M51# zHc(K4_*+<}$NgYd+rH!%^OftLy54`ypdi|N-rm{l3~O#chysR(Rk@?iMD^Fv_o0k;EMj0zAwE1X~8 zUf{kx#*=x)I%W$`mg(|8m_=DVJXsh7ra%0~EH5{Oi2)2GfTSazKnqJNa~o41BLj#( zg=u=-FJ`sr4&Rtr81GDH{J|^^q-r6QA)FFs1u4EWJ@E&#G(sM#43)YI)FgWcYGnb$ z$_AE3<`$5ZGGJ2#e=^GhO)>llwhTxKPmlS@EK={o0+a>fviC` zAIg`)YGD+}fax25F^g|s@r(Jwb*7s>)2lAA$f-&KO>qHALVyU^Z=g_z@j>z-({nGe z$ZLZf0TTuV0mw`kAEXQvsSrN&U6`yHt)^dhVNzv0F#Ru(r&8cv;4ZM0$>aa`U;hR69&p>E#i#(`e}?nh QV_cbln0b4QE6b790E0F%`v3p{ delta 123 zcmZ4RNO-{`;SFK?n1ooGBlc~N*vI&!Mey$r886`s?VZU9A_*D{3?KeZ_jP7E$~bAd zunSW=W7zcBE=<;p7Spf0FsU-`nf@2ZQxVw8> 24) & 0xFF - img_ver_minor = 3 # Instead of (modified_timestamp >> 16) & 0xFF + img_ver_minor = 4 # Instead of (modified_timestamp >> 16) & 0xFF img_ver_revision = 0 # Instead of modified_timestamp & 0xFFFF img_ver_build = modified_timestamp diff --git a/tools/targets/NU_M2354.py b/tools/targets/NU_M2354.py index 8bada32af97..a6894a18145 100644 --- a/tools/targets/NU_M2354.py +++ b/tools/targets/NU_M2354.py @@ -98,7 +98,7 @@ def m2354_tfm_bin(t_self, non_secure_image, secure_bin): # modified_timestamp = int(datetime.now().timestamp()) - int(datetime(2020, 1, 1).timestamp()) img_ver_major = 1 # Instead of (modified_timestamp >> 24) & 0xFF - img_ver_minor = 3 # Instead of (modified_timestamp >> 16) & 0xFF + img_ver_minor = 4 # Instead of (modified_timestamp >> 16) & 0xFF img_ver_revision = 0 # Instead of modified_timestamp & 0xFFFF img_ver_build = modified_timestamp