From 5a567817bf3152da95be6a118b6cbf5ee6b964b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20J=C3=B8lsgard?= Date: Wed, 25 Jun 2025 12:34:17 +0200 Subject: [PATCH] manifest: update internal repository revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update nrf-bm-internal revision. Some changes required to Kconfig etc. Signed-off-by: Eivind Jølsgard --- boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk | 9 ++++++--- ..._nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig | 3 +++ ...5dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig | 3 +++ ..._nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig | 3 +++ ...5dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig | 3 +++ ..._nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig | 3 +++ ...5dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig | 3 +++ subsys/softdevice/CMakeLists.txt | 1 - subsys/softdevice/Kconfig | 9 +++++++-- subsys/softdevice_handler/CMakeLists.txt | 2 +- west.yml | 2 +- 11 files changed, 33 insertions(+), 8 deletions(-) diff --git a/boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk b/boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk index d77b9b82fd..61ac419246 100644 --- a/boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig +++ b/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 diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig index c2087ec652..6559733770 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig +++ b/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 diff --git a/subsys/softdevice/CMakeLists.txt b/subsys/softdevice/CMakeLists.txt index 44164fefb9..19c92c94cb 100644 --- a/subsys/softdevice/CMakeLists.txt +++ b/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() diff --git a/subsys/softdevice/Kconfig b/subsys/softdevice/Kconfig index d64b95b1a1..9053f93ee8 100644 --- a/subsys/softdevice/Kconfig +++ b/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 diff --git a/subsys/softdevice_handler/CMakeLists.txt b/subsys/softdevice_handler/CMakeLists.txt index 5fc6b858a4..7cab0681d4 100644 --- a/subsys/softdevice_handler/CMakeLists.txt +++ b/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) diff --git a/west.yml b/west.yml index 5ebfca46b7..1b549828ba 100644 --- a/west.yml +++ b/west.yml @@ -34,7 +34,7 @@ manifest: - zcbor - name: sdk-nrf-bm-internal path: nrf-bm-internal - revision: 2086b4bb5ee2cc68b824fe5ecd4e2461987e4c5c + revision: pull/6/head groups: - nrf-bm-internal