Skip to content

Commit

Permalink
treewide: Remove references to pre-release ICs
Browse files Browse the repository at this point in the history
The nRF54H20 EngB and the nRF54L15 EngA have been removed.

Signed-off-by: Carles Cufi <[email protected]>
  • Loading branch information
carlescufi committed Nov 25, 2024
1 parent e47a6a3 commit 7b62e35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
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

0 comments on commit 7b62e35

Please sign in to comment.