From 549e7550c81672f296f2b6c9e29e02886da6b99d Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Wed, 11 Sep 2024 15:08:36 +0200 Subject: [PATCH] samples ipc_service/static_vrings: Enable for nrf5340bsim Enable this sample for the nrf5340bsim Signed-off-by: Alberto Escolar Piedras --- .../subsys/ipc/ipc_service/static_vrings/CMakeLists.txt | 1 + .../subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild | 1 + .../boards/nrf5340bsim_nrf5340_cpuapp.overlay | 7 +++++++ .../remote/boards/nrf5340bsim_nrf5340_cpunet.overlay | 7 +++++++ samples/subsys/ipc/ipc_service/static_vrings/sample.yaml | 2 ++ .../subsys/ipc/ipc_service/static_vrings/sysbuild.cmake | 3 +++ 6 files changed, 21 insertions(+) create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay create mode 100644 samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay diff --git a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt index 4deb07c4789a41..588bfe71dd0c48 100644 --- a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt +++ b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt @@ -12,6 +12,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) if(NOT (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR + CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 diff --git a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild index a1214db3284ce7..4f9caa8250168c 100644 --- a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild +++ b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild @@ -8,6 +8,7 @@ source "share/sysbuild/Kconfig" config NET_CORE_BOARD string default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" + default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim" default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69" default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000000..53c9b68afe742a --- /dev/null +++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf5340dk_nrf5340_cpuapp.overlay" diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay new file mode 100644 index 00000000000000..5717670556424b --- /dev/null +++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf5340dk_nrf5340_cpunet.overlay" diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml index 911b3624e44dc5..d15df7b803e45a 100644 --- a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml +++ b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml @@ -4,12 +4,14 @@ tests: sample.ipc.static_vrings: platform_allow: - nrf5340dk/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpuapp - lpcxpresso55s69/lpc55s69/cpu0 - mimxrt1160_evk/mimxrt1166/cm7 - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1170_evk@B/mimxrt1176/cm7 integration_platforms: - nrf5340dk/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpuapp tags: ipc sysbuild: true harness: console diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake index 2e99a95d3c355d..cf5de9dd941c79 100644 --- a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake +++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake @@ -21,3 +21,6 @@ ExternalZephyrProject_Add( # remote core's build, such as the output image's LMA add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP}) sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} ${REMOTE_APP}) + +native_simulator_set_child_images(${DEFAULT_IMAGE} remote) +native_simulator_set_final_executable(${DEFAULT_IMAGE})