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

cmake: dts: Use temporary file for dts.cmake with sysbuild #2267

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

nordicjm
Copy link
Contributor

Uses a temporary file when sysbuild is being used for images then uses CMake to copy to the correct file if it has changed. This prevents a ping-pong of configuring and building cycle when nothing has changed and there is sysbuild code which loads in the devicetree data from an image

Upstream PR #: 81340

Copy link
Contributor

@trantanen trantanen left a comment

Choose a reason for hiding this comment

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

This is fixing rebuilding when doing west flash after west build at least with asset_tracker_v2 and modem_shell when there are multiple images (FOTA configurations having mcuboot).

cmake/modules/dts.cmake Outdated Show resolved Hide resolved
Uses a temporary file for dts output then uses CMake to copy to the
correct file if it has changed. This prevents a ping-pong issue when
sysbuild is used of configuring and building cycle when nothing has
changed and there is sysbuild code which loads in the devicetree
data from an image

Upstream PR #: 81340

Signed-off-by: Jamie McCrae <[email protected]>
@tejlmand
Copy link
Contributor

@trantanen when a PR in sdk-zephyr is a fromlist, then please give review comments in the linked upstream PR: zephyr:81340
and not in the downstream fromlist.

@trantanen
Copy link
Contributor

@trantanen when a PR in sdk-zephyr is a fromlist, then please give review comments in the linked upstream PR: zephyr:81340 and not in the downstream fromlist.

Sorry about that. I noticed there was upstream PR only after reviewing. I didn't pay attention this was fromlist as I don't tend to look at commits but just the changes of the PR as a whole. And there was no link to upstream but later realized the PR number is there but you don't link them anymore to avoid spamming in upstream.

@nordicjm nordicjm merged commit aa40507 into nrfconnect:main Nov 15, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants