Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

samples: modules: canopennode: set bootloader in sample.yaml #74101

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Jun 11, 2024

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.

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.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
gmarull added a commit to gmarull/sdk-zephyr that referenced this pull request Jun 11, 2024
…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)
@gmarull gmarull added the bug The issue is a bug, or the PR is fixing a bug label Jun 11, 2024
Copy link
Member

@PerMac PerMac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@henrikbrixandersen henrikbrixandersen added the Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc. label Jun 11, 2024
Copy link
Collaborator

@nordic-piks nordic-piks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked at CI at HW - working fine.

anangl pushed a commit to nrfconnect/sdk-zephyr that referenced this pull request Jun 12, 2024
…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)
@nashif nashif merged commit 238d113 into zephyrproject-rtos:main Jun 12, 2024
26 checks passed
ahasztag pushed a commit to ahasztag/sdk-zephyr that referenced this pull request Jun 18, 2024
…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)
anangl pushed a commit to anangl/sdk-zephyr that referenced this pull request Jul 1, 2024
…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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: CAN area: Samples Samples bug The issue is a bug, or the PR is fixing a bug Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.