patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

modules: tfm: Allow enabling FPU in the application with TF-M enabled

Browse source 
Allow the application to enable the FPU when TF-M has been enabled.
Pass the correct compilation flags according to the TF-M integration
guide.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2022-03-30 12:12:31 +02:00 committed by Fabio Baltieri
parent c57a41c5d2
commit cb32d8e8e9
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/aarch32/Kconfig
View file

@ -254,14 +254,10 @@ choice
config FP_HARDABI
bool "Floating point Hard ABI"
depends on !BUILD_WITH_TFM
help
This option selects the Floating point ABI in which hardware floating
point instructions are generated and uses FPU-specific calling
conventions.
Note: the option is disabled for Zephyr builds with TF-M, as TF-M
does not currently support building with Hard ABI, hence linking
Zephyr with TF-M libraries would not be possible.
config FP_SOFTABI
bool "Floating point Soft ABI"

7
modules/trusted-firmware-m/CMakeLists.txt
View file

@ -238,6 +238,13 @@ if (CONFIG_BUILD_WITH_TFM)
)
endif()
if(CONFIG_FPU AND CONFIG_FP_HARDABI)
list(APPEND TFM_CMAKE_ARGS -DCONFIG_TFM_FP=hard)
list(APPEND TFM_CMAKE_ARGS -DCONFIG_TFM_FP_ARCH=${FPU_FOR_${GCC_M_CPU}})
else()
list(APPEND TFM_CMAKE_ARGS -DCONFIG_TFM_FP=soft)
endif()
file(MAKE_DIRECTORY ${TFM_BINARY_DIR})
add_custom_target(tfm_cmake
DEPENDS ${TFM_BINARY_DIR}/CMakeCache.txt