Skip to content

Commit f9bfe53

Browse files
gmarullanangl
authored andcommitted
[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: zephyrproject-rtos/zephyr#74101 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 4ca5c66b34e973a83f909d06ffde857e90f57aa6)
1 parent d038c24 commit f9bfe53

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

samples/modules/canopennode/sample.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ tests:
2424
- twr_ke18f
2525
integration_platforms:
2626
- frdm_k64f
27-
extra_args: canopennode_CONF_FILE=prj_img_mgmt.conf
27+
extra_args:
28+
canopennode_CONF_FILE=prj_img_mgmt.conf
29+
SB_CONFIG_BOOTLOADER_MCUBOOT=y
30+
2831
sample.modules.canopennode.no_storage:
2932
extra_args: CONF_FILE=prj_no_storage.conf

samples/modules/canopennode/sysbuild.conf

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)