bluetooth: Use different arch directory per bsim platform

A seperate arch directory is defined per bsim platform to be able to use different plarforms in the same build process Signed-off-by: Ilhan Ates <[email protected]>
nrfconnect · Aug 29, 2024 · 395a929 · 395a929
1 parent 9e4d3e4
commit 395a929
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/common.cmake b/common.cmake
@@ -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)
+    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.")

diff --git a/mpsl/Kconfig b/mpsl/Kconfig
@@ -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