Skip to content

sysbuild: Align 53bsim with 53 SoC #24742

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

Merged
merged 2 commits into from
Oct 1, 2025
Merged

sysbuild: Align 53bsim with 53 SoC #24742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9150f58
sysbuild: nrf53bsim: Set defaults similar to 5340 soc
rugeGerritsen Sep 29, 2025
43e798b
tests: nrf_auracast: Simplify network core building
rugeGerritsen Sep 29, 2025
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
4 changes: 2 additions & 2 deletions sysbuild/Kconfig.netcore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ config EXTERNAL_CONFIGURED_NETCORE

config SUPPORT_NETCORE
bool
default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP)
default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || BOARD_NRF5340BSIM_NRF5340_CPUAPP)

config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
string
default "cpunet" if SOC_NRF5340_CPUAPP
default "cpunet" if (SOC_NRF5340_CPUAPP || BOARD_NRF5340BSIM_NRF5340_CPUAPP)
default "cpurad" if SOC_NRF54H20_CPUAPP

config NETCORE_REMOTE_DOMAIN
Expand Down
6 changes: 6 additions & 0 deletions sysbuild/netcore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,10 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI
endif()

set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS})

if(SB_CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP)
native_simulator_set_child_images(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${SB_CONFIG_NETCORE_IMAGE_NAME})
native_simulator_set_final_executable(${DEFAULT_IMAGE})
endif()
endif()
7 changes: 3 additions & 4 deletions tests/bluetooth/bsim/nrf_auraconfig/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@

source "share/sysbuild/Kconfig"

config NET_CORE_BOARD
string
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"

config NRF_DEFAULT_IPC_RADIO
bool
default y

config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int
Expand Down
27 changes: 0 additions & 27 deletions tests/bluetooth/bsim/nrf_auraconfig/sysbuild.cmake
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions tests/bluetooth/bsim/nrf_auraconfig/tester/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@

source "share/sysbuild/Kconfig"

config NET_CORE_BOARD
string
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"

config NRF_DEFAULT_IPC_RADIO
bool
default y

config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int
Expand Down
27 changes: 0 additions & 27 deletions tests/bluetooth/bsim/nrf_auraconfig/tester/sysbuild.cmake
View file
Open in desktop

This file was deleted.