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

bluetooth: Use different arch directory per bsim platform #1447

Merged
merged 1 commit into from
Aug 29, 2024
Merged

bluetooth: Use different arch directory per bsim platform #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ function(nrfxlib_calculate_lib_path lib_path)
elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD)
set(arch_soc_dir ${arch_soc_dir}_cpurad)
endif()
elseif(CONFIG_SOC_SERIES_BSIM_NRFXX)
set(arch_soc_dir "bsim_nrfxx")
elseif(CONFIG_SOC_SERIES_BSIM_NRF52X)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We dont use this function in mpsl/sdc anymore but I guess it is ok to add it here as well.

set(arch_soc_dir "bsim_nrf52")
elseif(CONFIG_SOC_SERIES_BSIM_NRF53X)
set(arch_soc_dir "bsim_nrf53")
elseif(CONFIG_SOC_SERIES_BSIM_NRF54LX)
set(arch_soc_dir "bsim_nrf54l")
else()
# Add Arch type
assert(GCC_M_CPU "GCC_M_CPU must be set to find correct lib.")
Expand Down
6 changes: 4 additions & 2 deletions mpsl/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ if MPSL_BUILD_TYPE_LIB
config MPSL_LIB_DIR
string
default "nrf52" if SOC_SERIES_NRF52X
default "nrf53" if SOC_COMPATIBLE_NRF5340_CPUNET
default "nrf53" if SOC_NRF5340_CPUNET
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_nrfxx" if SOC_SERIES_BSIM_NRFXX
default "bsim_nrf52" if SOC_SERIES_BSIM_NRF52X
default "bsim_nrf53" if SOC_SERIES_BSIM_NRF53X
default "bsim_nrf54l" if SOC_SERIES_BSIM_NRF54LX
help
Hidden helper option to calculate the library path

Expand Down
Loading