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.

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

treewide: Remove references to pre-release ICs #1582

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 2 additions & 3 deletions common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,12 @@ function(nrfxlib_calculate_lib_path lib_path)
set(arch_soc_dir ${arch_soc_dir}_cpuapp)
elseif(DEFINED CONFIG_SOC_NRF5340_CPUNET)
set(arch_soc_dir ${arch_soc_dir}_cpunet)
elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L15_ENGA_CPUAPP
OR DEFINED CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L20_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)
endif()
elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD OR DEFINED CONFIG_SOC_NRF54H20_ENGB_CPURAD)
elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD)
set(arch_soc_dir ${arch_soc_dir}_cpurad)
endif()
elseif(CONFIG_SOC_SERIES_BSIM_NRF52X)
Expand Down
4 changes: 2 additions & 2 deletions mpsl/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ config MPSL
select NRF_802154_MULTIPROTOCOL_SUPPORT if NRF_802154_RADIO_DRIVER
select MULTITHREADING_LOCK
depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_NRF5340_CPUNET ||\
SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX)
SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX)
help
Use Nordic Multi Protocol Service Layer (MPSL) implementation,
providing services for single and multi-protocol implementations.
Expand All @@ -32,7 +32,7 @@ config MPSL_LIB_DIR
string
default "nrf52" if SOC_SERIES_NRF52X
default "nrf53" if SOC_NRF5340_CPUNET
default "nrf54h" if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
default "nrf54h" if SOC_NRF54H20_CPURAD
default "nrf54l_ns" if SOC_SERIES_NRF54LX && TRUSTED_EXECUTION_NONSECURE
default "nrf54l" if SOC_SERIES_NRF54LX && !TRUSTED_EXECUTION_NONSECURE
default "bsim_nrf52" if SOC_SERIES_BSIM_NRF52X
Expand Down
Loading