From be31a84710aac23f5badd32ba3d692fa1b29b783 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 11 Jun 2024 16:46:05 +0200 Subject: [PATCH] [nrf fromlist] samples: modules: canopennode: set bootloader in sample.yaml Set the bootloader choice for the sample.modules.canopennode.program_download test case in the sample.yaml file instead of sysbuild.conf. The reason for this change is to avoid building MCUboot by default when using the --sysbuild option, as it may not be compatible with all platforms. This is currently causing issues on platforms like nRF54H20 where sysbuild is always used. Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/74101 Signed-off-by: Gerard Marull-Paretas (cherry picked from commit 4ca5c66b34e973a83f909d06ffde857e90f57aa6) (cherry picked from commit f9bfe53c057387db36320a262264abd2669a9b41) --- samples/modules/canopennode/sample.yaml | 5 ++++- samples/modules/canopennode/sysbuild.conf | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 samples/modules/canopennode/sysbuild.conf diff --git a/samples/modules/canopennode/sample.yaml b/samples/modules/canopennode/sample.yaml index f85c50138bd..2a9d0bbd147 100644 --- a/samples/modules/canopennode/sample.yaml +++ b/samples/modules/canopennode/sample.yaml @@ -24,6 +24,9 @@ tests: - twr_ke18f integration_platforms: - frdm_k64f - extra_args: canopennode_CONF_FILE=prj_img_mgmt.conf + extra_args: + canopennode_CONF_FILE=prj_img_mgmt.conf + SB_CONFIG_BOOTLOADER_MCUBOOT=y + sample.modules.canopennode.no_storage: extra_args: CONF_FILE=prj_no_storage.conf diff --git a/samples/modules/canopennode/sysbuild.conf b/samples/modules/canopennode/sysbuild.conf deleted file mode 100644 index 47f00ff3cff..00000000000 --- a/samples/modules/canopennode/sysbuild.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_BOOTLOADER_MCUBOOT=y