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

sysbuild changes #1677

Merged
merged 13 commits into from
May 2, 2024
Merged

sysbuild changes #1677

merged 13 commits into from
May 2, 2024

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented May 1, 2024

Upstream changes needed for sysbuild integration

Commit 9fa2c82 needs adding to technical debt page once merged

nordicjm added 13 commits May 1, 2024 07:42
Fixes an issue whereby the board name was missing

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 23551eb)
Fixes an issue with zephyr modules not being listed in sysbuild if
they did not have a Kconfig file set

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit acd14f8)
…yr_build_string

Fixes a missed entry and a wrong named variable in the
documentation for this function

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 43c323a)
Adds support for a new ``socs`` folder that can be placed in
application folders and functions similar to the ``boards``
folder, but works for SoCs instead of boards

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 6f58159)
…oc overlays

Adds support for SoC overlay files which go in a ``socs`` folder
in application folders and functions similar to the ``boards``
folder, but works for SoCs instead of boards

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 6ed5ac7)
Adds a testcase for the new ``socs`` folder using Kconfig fragments

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 1ed6d89)
Adds a testcase for the new ``socs`` folder, with overlays

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit da3007e)
Adds details about Kconfig fragments and devicetree overlay files
that will be included in a build if they are found in the
``socs`` folder

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit af46765)
This adds supports for flashing images with sysbuild where there
are multiple images per board to prevent using the same command per
image flash which might cause issues if they are not ran just once
per flash per unique board name. A deferred reset feature is also
introduced that prevents a board (or multiple) from being reset if
multiple images are to be flashed until the final one has been
flashed which prevents issues with e.g. security bits being enabled
that then prevent flashing further images.

These options can be set at a board level (in board.yml) or a SoC
level (in soc.yml), if both are present then the board configuration
will be used instead of the SoC, and regex can be used for matching
of partial names which allows for matching specific SoCs or CPU cores
regardless of the board being used

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit a0267d2)
Reformats the soc.yml file to have uniform 2-space indentation

Upmerge warning: this commit has been modified to remove cpuflpr

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 8b62a16)
…tion

Adds configuration that allows nRF53 and nRF91-based boards to be
flashed through west using sysbuild for multiple images with the
recover or erase options and prevent running those commands for
each image being flash, which would make the device unbootable.
Also defers reset whilst all images for the cores of these SoCs
are flashed.

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 4b2d19f)
Adds documentation on the new flashing configuration system

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit ff823c6)
…alidity

Adds checking that qualifiers listed in a soc.yml file are valid
for the socs and cpuclusters defined in that file

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 5033399)
@nordicjm nordicjm merged commit b5cf304 into nrfconnect:main May 2, 2024
41 checks passed
@nordicjm nordicjm deleted the sysbuildneededchanges branch November 6, 2024 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants