[nrf fromlist] samples: modules: canopennode: set bootloader in sampl…

…e.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: zephyrproject-rtos/zephyr#74101 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 4ca5c66b34e973a83f909d06ffde857e90f57aa6) (cherry picked from commit f9bfe53)
anangl · Jul 1, 2024 · be31a84 · be31a84
1 parent 0d25006
commit be31a84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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