Skip to content

manifest: update internal repository revision #278

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

manifest: update internal repository revision #278

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
9 changes: 6 additions & 3 deletions boards/nordic/bm_nrf54l15dk/Kconfig.bm_nrf54l15dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion subsys/softdevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
9 changes: 7 additions & 2 deletions subsys/softdevice/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion subsys/softdevice_handler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading