Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nrf_802154: nRF54L15 use non-secure SL library for builds with CONFIG_TRUSTED_EXECUTION_NONSECURE #1431

Merged
merged 2 commits into from
Aug 12, 2024
Merged

nrf_802154: nRF54L15 use non-secure SL library for builds with CONFIG_TRUSTED_EXECUTION_NONSECURE #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390aff1
cmake: nrfxlib_calculate_lib_path add NS_PROVIDED to allow non-secure…
ankuns Aug 7, 2024
8a5da6e
nrf_802154: use NS_PROVIDED when selecting SL library path.
ankuns Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ include_guard(GLOBAL)
#
# SOC_MODE: Use the SoC name instead of the SoC architecture when calculating the path.
# For example 'nrf52840' will be used for the path instead of 'cortex-m4'
# NS_PROVIDED Use name identifying non-secure library version for builds with
# 'CONFIG_TRUSTED_EXECUTION_NONSECURE' on supported SoCs.
# Libraries that do not distinguish between secure and non-secure version
# should not use this parameter.
# BASE_DIR: Base path from where the calculated path should start from.
# When specifying BASE_DIR the path returned will be absolute, or
# '<dir>-NOTFOUND' if the path does not exists
Expand All @@ -28,7 +32,7 @@ include_guard(GLOBAL)
# This flag requires 'BASE_DIR'
#
function(nrfxlib_calculate_lib_path lib_path)
cmake_parse_arguments(CALC_LIB_PATH "SOFT_FLOAT_FALLBACK;SOC_MODE" "BASE_DIR" "" ${ARGN})
cmake_parse_arguments(CALC_LIB_PATH "SOFT_FLOAT_FALLBACK;SOC_MODE;NS_PROVIDED" "BASE_DIR" "" ${ARGN})

if(CALC_LIB_PATH_SOFT_FLOAT_FALLBACK AND NOT DEFINED CALC_LIB_PATH_BASE_DIR)
message(WARNING "nrfxlib_calculate_lib_path(SOFT_FLOAT_FALLBACK ...) "
Expand All @@ -46,6 +50,9 @@ function(nrfxlib_calculate_lib_path lib_path)
set(arch_soc_dir ${arch_soc_dir}_cpunet)
elseif(DEFINED CONFIG_SOC_NRF54L15_ENGA_CPUAPP)
set(arch_soc_dir ${arch_soc_dir}_cpuapp)
if(DEFINED CONFIG_TRUSTED_EXECUTION_NONSECURE AND ${CALC_LIB_PATH_NS_PROVIDED})
set(arch_soc_dir ${arch_soc_dir}_ns)
e-rk marked this conversation as resolved.
Show resolved Hide resolved
endif()
elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD)
set(arch_soc_dir ${arch_soc_dir}_cpurad)
endif()
Expand Down
2 changes: 1 addition & 1 deletion nrf_802154/sl/sl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (CONFIG_NRF_802154_RADIO_DRIVER)

add_library(nrf-802154-sl INTERFACE)

nrfxlib_calculate_lib_path(lib_path SOC_MODE)
nrfxlib_calculate_lib_path(lib_path SOC_MODE NS_PROVIDED)

set(NRF_802154_SL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${lib_path})

Expand Down
Loading