michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples|tests several: Support using nrf5340bsim hwmv2 names

Browse source 
For all samples which handle the nrf5340bsim in some special way
(for example in sysbuild files, or by checking what samples are
supported) handle also building with the hwmv2 names.

Also, let's fix the cmake info message in these respective
samples which tells the user which board target is used for which
part of the app.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2024-03-18 15:39:54 +01:00 • committed by Carles Cufí
commit 4235efc7bd
19 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/bluetooth/broadcast_audio_sink/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if "$(BOARD)$(BOARD_IDENTIFIER)" = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

1
samples/bluetooth/broadcast_audio_source/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if "$(BOARD)$(BOARD_IDENTIFIER)" = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

1
samples/bluetooth/public_broadcast_sink/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if "$(BOARD)$(BOARD_IDENTIFIER)" = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

1
samples/bluetooth/public_broadcast_source/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

1
samples/bluetooth/unicast_audio_client/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

1
samples/bluetooth/unicast_audio_server/Kconfig.sysbuild
View file

@ -8,6 +8,7 @@ config NET_CORE_BOARD
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk" default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if "$(BOARD)" = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NET_CORE_IMAGE_HCI_IPC config NET_CORE_IMAGE_HCI_IPC
bool "HCI IPC image on network core" bool "HCI IPC image on network core"

3
samples/boards/nrf/nrf53_sync_rtc/CMakeLists.txt
View file

@ -8,8 +8,9 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}${BOARD_IDENTIFIER}" STREQUAL "nrf5340bsim/nrf5340/cpuapp") OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp")) ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp"))
message(INFO " ${BOARD} used for Application Core") message(INFO " ${BOARD}${BOARD_IDENTIFIER} used for Application Core")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD} is not supported for this sample")
endif() endif()

1
samples/boards/nrf/nrf53_sync_rtc/Kconfig.sysbuild
View file

@ -8,3 +8,4 @@ config NET_CORE_BOARD
string string
default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"

5
samples/boards/nrf/nrf53_sync_rtc/net/CMakeLists.txt
View file

@ -8,8 +8,9 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet")) ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet") OR
message(INFO " ${BOARD} used for Network Core") ("${BOARD}" STREQUAL "nrf5340bsim"))
message(INFO " ${BOARD}${BOARD_IDENTIFIER} used for Network Core")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD} is not supported for this sample")
endif() endif()

3
samples/drivers/mbox/CMakeLists.txt
View file

@ -12,6 +12,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}${BOARD_IDENTIFIER}" STREQUAL "nrf5340bsim/nrf5340/cpuapp") OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp") OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp") OR
("${BOARD}" STREQUAL "adp_xc7k") OR ("${BOARD}" STREQUAL "adp_xc7k") OR
("${BOARD}" STREQUAL "mimxrt1170_evkb") OR ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
@ -19,7 +20,7 @@ if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "mimxrt1160_evk") OR
("${BOARD}" STREQUAL "lpcxpresso55s69") OR ("${BOARD}" STREQUAL "lpcxpresso55s69") OR
("${BOARD}" STREQUAL "nrf54h20dk")) ("${BOARD}" STREQUAL "nrf54h20dk"))
message(STATUS "${BOARD} compile as Main in this sample") message(STATUS "${BOARD}${BOARD_IDENTIFIER} compile as Main in this sample")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD} is not supported for this sample")
endif() endif()

1
samples/drivers/mbox/Kconfig.sysbuild
View file

@ -9,6 +9,7 @@ config REMOTE_BOARD
string string
default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
default "adp_xc7k/ae350" if $(BOARD) = "adp_xc7k" default "adp_xc7k/ae350" if $(BOARD) = "adp_xc7k"
default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb" default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"

3
samples/drivers/mbox/remote/CMakeLists.txt
View file

@ -10,6 +10,7 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}" STREQUAL "nrf5340bsim") OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet") OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet") OR
("${BOARD}" STREQUAL "mimxrt1170_evkb") OR ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
("${BOARD}" STREQUAL "mimxrt1170_evk") OR ("${BOARD}" STREQUAL "mimxrt1170_evk") OR
@ -17,7 +18,7 @@ if(("${BOARD}" STREQUAL "nrf5340dk") OR
("${BOARD}" STREQUAL "lpcxpresso55s69") OR ("${BOARD}" STREQUAL "lpcxpresso55s69") OR
("${BOARD}" STREQUAL "adp_xc7k") OR ("${BOARD}" STREQUAL "adp_xc7k") OR
("${BOARD}" STREQUAL "nrf54h20dk")) ("${BOARD}" STREQUAL "nrf54h20dk"))
message(STATUS "${BOARD} compile as remote in this sample") message(STATUS "${BOARD}${BOARD_IDENTIFIER} compile as remote in this sample")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD} is not supported for this sample")
endif() endif()

3
samples/subsys/logging/multidomain/CMakeLists.txt
View file

@ -9,8 +9,9 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
if(NOT(("${BOARD}" STREQUAL "nrf5340dk") if(NOT(("${BOARD}" STREQUAL "nrf5340dk")
OR ("${BOARD}${BOARD_IDENTIFIER}" STREQUAL "nrf5340bsim/nrf5340/cpuapp")
OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp"))) OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp")))
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD}${BOARD_IDENTIFIER} is not supported for this sample")
endif() endif()
project(log_multidomain) project(log_multidomain)

1
samples/subsys/logging/multidomain/Kconfig.sysbuild
View file

@ -8,3 +8,4 @@ config NET_CORE_BOARD
string string
default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"

1
tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild
View file

@ -8,3 +8,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
# Let's pass the test arguments to the application MCU test # Let's pass the test arguments to the application MCU test
# otherwise by default they would have gone to the net core. # otherwise by default they would have gone to the net core.
default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default 0 if $(BOARD) = "nrf5340bsim"

1
tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild
View file

@ -8,3 +8,4 @@ config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
# Let's pass the test arguments to the application MCU test # Let's pass the test arguments to the application MCU test
# otherwise by default they would have gone to the net core. # otherwise by default they would have gone to the net core.
default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default 0 if $(BOARD) = "nrf5340bsim"

2
tests/bsim/bluetooth/ll/bis/Kconfig.sysbuild
View file

@ -6,9 +6,11 @@ source "share/sysbuild/Kconfig"
config NET_CORE_BOARD config NET_CORE_BOARD
string string
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int int
# Let's pass the test arguments to the application MCU test # Let's pass the test arguments to the application MCU test
# otherwise by default they would have gone to the net core. # otherwise by default they would have gone to the net core.
default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default 0 if $(BOARD) = "nrf5340bsim"

2
tests/bsim/bluetooth/ll/cis/Kconfig.sysbuild
View file

@ -6,9 +6,11 @@ source "share/sysbuild/Kconfig"
config NET_CORE_BOARD config NET_CORE_BOARD
string string
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int int
# Let's pass the test arguments to the application MCU test # Let's pass the test arguments to the application MCU test
# otherwise by default they would have gone to the net core. # otherwise by default they would have gone to the net core.
default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default 0 if $(BOARD) = "nrf5340bsim"

2
tests/bsim/bluetooth/ll/conn/Kconfig.sysbuild
View file

@ -6,9 +6,11 @@ source "share/sysbuild/Kconfig"
config NET_CORE_BOARD config NET_CORE_BOARD
string string
default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD)$(BOARD_IDENTIFIER) = "nrf5340bsim/nrf5340/cpuapp"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int int
# Let's pass the test arguments to the application MCU test # Let's pass the test arguments to the application MCU test
# otherwise by default they would have gone to the net core. # otherwise by default they would have gone to the net core.
default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default 0 if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp"
default 0 if $(BOARD) = "nrf5340bsim"