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,9 @@
 #
 
 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

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig

@@ -4,6 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# SoftDevice variant
+CONFIG_SOFTDEVICE_S115=y
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_BM_UARTE_CONSOLE=y

subsys/softdevice/CMakeLists.txt

@@ -3,7 +3,6 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-
 if(CONFIG_SOFTDEVICE_S115)
   zephyr_include_directories("${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/${CONFIG_SOFTDEVICE_VARIANT_STR}/${CONFIG_SOFTDEVICE_VARIANT_STR}_API/include")
 endif()

subsys/softdevice/Kconfig

@@ -23,12 +23,17 @@ config SOFTDEVICE_QOS_CHANNEL_SURVEY_REPORT
 
 if SOFTDEVICE
 
+choice SOFTDEVICE_VARIANT
+	prompt "SoftDevice variant"
+	default SOFTDEVICE_S115
+
 config SOFTDEVICE_S115
-	bool
+	bool "S115"
 	depends on SOC_SERIES_NRF54LX
 	select SOFTDEVICE_PERIPHERAL
 	select SOFTDEVICE_DATA_LENGTH_UPDATE
-	default y
+
+endchoice # SOFTDEVICE_VARIANT
 
 config SOFTDEVICE_VARIANT_STR
 	string

subsys/softdevice_handler/CMakeLists.txt

@@ -11,7 +11,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)