manifest: update internal repository revision

Update nrf-bm-internal revision.
Some changes required to Kconfig etc.

Signed-off-by: Eivind Jølsgard <[email protected]>

Author: eivindj-nordic

boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk

@@ -5,6 +5,19 @@
 #
 
 config BOARD_BM_NRF54L15DK
-	select SOC_NRF54L05_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT
-	select SOC_NRF54L10_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT
-	select SOC_NRF54L15_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT
+	select SOC_NRF54L05_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || \
+				      BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT
+	select SOC_NRF54L10_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || \
+				      BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT
+	select SOC_NRF54L15_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || \
+				      BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT
+
+config HAS_SOFTDEVICE_S115
+	bool
+	depends on BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || \
+		   BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \
+		   BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || \
+		   BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \
+		   BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || \
+		   BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT
+	default y

subsys/softdevice/Kconfig

@@ -21,6 +21,7 @@ if SOFTDEVICE
 config SOFTDEVICE_S115
 	bool
 	depends on SOC_SERIES_NRF54LX
+	depends on HAS_SOFTDEVICE_S115
 	select SOFTDEVICE_PERIPHERAL
 	default y
 

subsys/softdevice_handler/CMakeLists.txt

@@ -10,7 +10,7 @@ zephyr_library_sources(
   irq_connect.c
 )
 
-if (CONFIG_SOFTDEVICE_S115)
+if (CONFIG_SOFTDEVICE AND CONFIG_SOC_SERIES_NRF54LX)
   zephyr_library_sources(irq_forward.s)
   # Suppress the swap_helper.S file so that z_arm_svc can be defined manually
   set(cortex_m_dir ${ZEPHYR_BASE}/arch/arm/core/cortex_m)

west.yml

@@ -34,7 +34,7 @@ manifest:
           - cmock
     - name: sdk-nrf-bm-internal
       path: nrf-bm-internal
-      revision: 2086b4bb5ee2cc68b824fe5ecd4e2461987e4c5c
+      revision: pull/6/head
       groups:
         - nrf-bm-internal