From 19f6d000e216c08ca8bb5b67d929682d76ed5003 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Wed, 11 Sep 2024 14:13:52 +0200 Subject: [PATCH] samples ipc_service/icmsg: Enable for nrf5340bsim Enable this sample for the nrf5340bsim Signed-off-by: Alberto Escolar Piedras --- samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt | 1 + samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild | 1 + .../icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay | 7 +++++++ .../icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay | 7 +++++++ samples/subsys/ipc/ipc_service/icmsg/sample.yaml | 5 ++++- samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake | 3 +++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay create mode 100644 samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay diff --git a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt index 725fd7071749426..e9e246b02fad063 100644 --- a/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt +++ b/samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt @@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND + NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND NOT CONFIG_BOARD_STM32H747I_DISCO AND NOT CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP) message(FATAL_ERROR "${BOARD} is not supported for this sample") diff --git a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild index 9a2c85d065d6992..41b892aba6a80e8 100644 --- a/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild +++ b/samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild @@ -7,5 +7,6 @@ source "share/sysbuild/Kconfig" config REMOTE_BOARD string default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" + default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim" default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk" default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco" diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 000000000000000..53c9b68afe742a2 --- /dev/null +++ b/samples/subsys/ipc/ipc_service/icmsg/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/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay new file mode 100644 index 000000000000000..c5194cf93cd7268 --- /dev/null +++ b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340bsim_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2022 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf5340dk_nrf5340_cpunet.overlay" diff --git a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml index b981c1b82151bd2..321ed3398ed84a0 100644 --- a/samples/subsys/ipc/ipc_service/icmsg/sample.yaml +++ b/samples/subsys/ipc/ipc_service/icmsg/sample.yaml @@ -2,9 +2,12 @@ sample: name: IPC Service example integration (icmsg backend) tests: sample.ipc.icmsg: - platform_allow: nrf5340dk/nrf5340/cpuapp + platform_allow: + - nrf5340dk/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpuapp tags: ipc sysbuild: true harness: console diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake index b1f0947aff7c403..305c85cc3eb0eb7 100644 --- a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake +++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.cmake @@ -12,3 +12,6 @@ ExternalZephyrProject_Add( SOURCE_DIR ${APP_DIR}/remote BOARD ${SB_CONFIG_REMOTE_BOARD} ) + +native_simulator_set_child_images(${DEFAULT_IMAGE} remote) +native_simulator_set_final_executable(${DEFAULT_IMAGE})