-
Notifications
You must be signed in to change notification settings - Fork 735
[nrf fromlist] samples: cleanup sysbuild/hello_world sample #3264
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
Open
tejlmand
wants to merge
746
commits into
nrfconnect:main
Choose a base branch
from
tejlmand:sysbuild_hello_world_cleanup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a sysbuild Kconfig file which enables external flash when partition manager is enabled Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 41431fb)
Uses sysbuild by default when building an application which resides in an allowed NCS-based directory when the sysbuild config key is not set. Do not use sysbuild if the mps2 board is being used to avoid problems with CI testing. Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 5cfd8be)
Enables MCUboot, empty network core and network core updates by default when building for the thingy53 Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit b712330)
Add some socket options and address family extensions to Zephyr headers, which will be useful for nRF Connect SDK. Add secure socket options: * Add CID socket options to NCS specific options. * Add TLS/DTLS tls ciphersuite chosen socket option to NCS specific options. * Add TLS/DTLS connection save/load socket options to NCS specific options. * Add TLS/DTLS handshake status socket option to NCS specific options. * Add SO_KEEPOPEN socket option. * Add SO_RAI socket options. * Add SO_IPV6_DELAYED_ADDR_REFRESH socket option. The "author" of this commit is a contact person; various people with s-o-b lines following here have contributed to the maintenance of this patch. Signed-off-by: Andreas Moltumyr <[email protected]> Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Christopher Métrailler <[email protected]> Signed-off-by: Emanuele Di Santo <[email protected]> Signed-off-by: Glenn Ruben Bakke <[email protected]> Signed-off-by: Håkon Alseth <[email protected]> Signed-off-by: Ioannis Glaropoulos <[email protected]> Signed-off-by: Jan Tore Guggedal <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Martí Bolívar <[email protected]> Signed-off-by: Mirko Covizzi <[email protected]> Signed-off-by: Petri Honkala <[email protected]> Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Tommi Mammela <[email protected]> Signed-off-by: Trond Einar Snekvik <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Eivind Jølsgard <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit b9a0c11)
Partition Manager (PM) is a component of the nRF Connect SDK (NCS) which uses yaml files to resolve flash partition placement with a holistic view of the entire device, including each firmware image present on the flash device, and various subsystems, such as settings and NFFS. When this NCS extension is used, various source files which would use partition information from devicetree in "vanilla" zephyr instead use defines generated by PM instead. This commit removes support for HEX_FILES_TO_MERGE, as it conflicts with PM. The settings subsystem pm.yml defines a partition 'settings_storage'. The nffs subsystem pm.yml defines 'nffs_storage'. Leverage label translation to avoid patching partition names. Refer to the NCS documentation page for this feature for more details. This is a long-running out of tree patch which has been worked on by several people. The following sign-offs are in alphabetical order by first name. Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]> Signed-off-by: Håkon Øye Amundsen <[email protected]> Signed-off-by: Ioannis Glaropoulos <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Johann Fischer <[email protected]> Signed-off-by: Martí Bolívar <[email protected]> Signed-off-by: Ole Sæther <[email protected]> Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Sebastian Bøe <[email protected]> Signed-off-by: Sigvart Hovland <[email protected]> Signed-off-by: Thomas Stenersen <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Øyvind Rønningstad <[email protected]> Signed-off-by: Trond Einar Snekvik <[email protected]> Signed-off-by: Gerard Marull-Paretas <[email protected]> Signed-off-by: Tomasz Moń <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 7ad01c2)
Zephyr's boot banner should not be used if NCS boot banner is enabled. Signed-off-by: Robert Lubos <[email protected]> (cherry picked from commit 11254fb)
Removes explicit support for the legacy advertiser due to incompatibility with SDC. The legacy advertiser can be used (experimentally) with the Zephyr Link Layer enabled, but is not recommended. Signed-off-by: Håvard Reierstad <[email protected]> (cherry picked from commit 4680ad7)
Changes the default MCUboot mode to update only for the thingy53, to align with previous bootloader builds Changes the thingy53 default configuration for sysbuild to enable using all RAM in the MCUboot image Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit af016f5)
PM support is still required for nRF53/nRF54l15 in the context of NCS. Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 528a233)
Introduce NVS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that enables a dedicated hash function for the NVS lookup cache that takes advantage of the NVS ID allocation scheme used by the NVS settings backend. As such, this option should only be used if an application uses NVS via the settings layer. Signed-off-by: Damian Krolik <[email protected]> (cherry picked from commit aaa00db)
Do not permit configuring clocks from non-secure as NRF_OSCILLATORS is a not supported as a non-secure peripheral Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 0099c2c)
This action will automatically manage a PR to sdk-nrf once a PR to sdk-zephyr is created. This includes: - Creating an initial PR - Updating and (optionally) rebase it once the PR to sdk-nrf is merged. The action can be disabled by adding the string "manifest-pr-skip" to the title or body of the PR. This will simplify cherry-picking changes from upstream zephyr. Signed-off-by: Rubin Gerritsen <[email protected]> (cherry picked from commit 40f8ba3)
adjusting region resolution to match erase-block-size Signed-off-by: Mateusz Michalek <[email protected]> (cherry picked from commit 743b21b)
The nRF54H20 supports a Bluetooth controller. The HCI driver interface has changed upstream in zephyrproject-rtos/zephyr#72323 so now we need to add it to device tree. Signed-off-by: Rubin Gerritsen <[email protected]> (cherry picked from commit e9a13c3)
By default, the BLE stack calls sent callback for ATT data when the data is passed to BLE controller for transmission. Enabling this Kconfig option delays calling the sent callback until data transmission is finished by BLE controller (the callback is delayed until receiving the num complete packets event). Jira: NCSDK-27422 Signed-off-by: Marek Pieta <[email protected]> (cherry picked from commit 5cb2c90)
The Thingy:53 enabled MCUboot and external flash by default. Therefore, it should also enable drivers for its external flash by default. Signed-off-by: Sigurd Hellesvik <[email protected]> (cherry picked from commit d8ae490)
Adds handling code to allow selecting the correct image slot when using QSPI XIP in DirectXIP mode In case of Direct XIP and multiple images, the radio active slot changes accordingly (i.e. application slot 1 boots radio slot 1). Signed-off-by: Jamie McCrae <[email protected]> Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit eff4005)
While Partition Manager is enabled, it manages the offset by itself. Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit 8e130db)
Add overlay for nrf54l15dk to enable eGPIO tests. Signed-off-by: Jakub Zymelka <[email protected]> Signed-off-by: Marcin Szymczyk <[email protected]> (cherry picked from commit cdbdb26)
…neric -This commit prevents legacy mbed TLS configurations from being in conflict with PSA Configurations while using nrf_security. -This [nrf noup] is reworked from an earlier cherry-pick of commit d8c96cf, but has the following changes: - Endif's relevant that is using our pattern for masking configs duplicated or in conflict in nrf_security (by using if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)) is made clearer by adding a comment at their corresponding endif (# !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)) - Changes to zephyr_init.c for entropy_dev checking for CONFIG_NRF_CC3XX_PLATFORM is removed as the symbol entropy_dev doesn't exist in this file anymore ref: NCSDK-13503 Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 9e06da7)
-This is a [nrf noup] because PSA_WANT_GENERATE_RANDOM is a Nordic configuration that is not found upstream. This was previously in commit 5cfe575 but has been split out Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 2a84cc8)
-This commit is a [nrf noup] because it removes configuration options for cryptographic algortihms available in Mbed TLS but which is not actively supported in nRF Connect SDK. The list of algorithms removed: - AES CFB - Cipher Feedback block cipher - AES OFB - Output Feedback block cipher - FFDH - RIPEMD160 - Aria - Camellia - DES The removal of these algorithms is based both on a wish to remove weaker cryptography and unsupported features in the products we have today. Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit f0c6253)
-This is a [nrf noup] as this the upstream version of PSA crypto configs is generated by tooling, and there is no mechanisms to qualify that dependent configurations are enabled (by depends or select). -This adds dependency-mapping between configurations in the Kconfigs added for PSA crypto in upstream. -Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is enabled Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit abe1041)
-This commit is a [nrf noup] because PSA crypto configs in upstream Zephyr doesn't have help-text in their configurations and we don't want to duplicate configurations to control the value -This adds warning for SHA-1 and MD5 usage Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit e4e16eb)
-This is a [nrf noup] because the upstream Zephyr is generated using a script and is not committed as-is as source-code. The relevant responsible person for this feature has received information about the missing configuration and this will be resolved upstream in Mbed TLS and will propagate down to zephyr. Once this has happened, this [nrf noup] can be dropped. -Add missing PSA_WANT_KEY_TYPE_RSA_KEY_DERIVE Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 6ce5d2f)
-PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC is internally resolved by Mbed TLS. It has been made promptless in a previous commit. Keeping this change separated since the Kconfig.psa is auto-generated and it would likely be a bit more complex to handle this in a single commit. Upstream maintainers have been notified about this mismatch in configurations. Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 1a18abd)
Makes the boot banner function weak, this resolves an issue when building with llext enabled which uses different build options than a normal zephyr build Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 461df8c)
Although ZVFS is experimental, the warning is annoying the matter team. Therefore, remove the experimental selection. This may be reverted once upstream unselects experimental. Signed-off-by: Bjarki Arge Andreasen <[email protected]> (cherry picked from commit 835d545)
Make sure Wi-Fi driver is enabled in networking samples supporting Wi-Fi when sysbuild is used. For shields we cannot automate this, as sysbuild doesn't recognize shields, so, Wi-Fi has to be explicitly enabled, this is done for twister in Wi-Fi sample. Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 48f4e3b)
- We don't use this mechanism in nRF Connect SDK Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 4bdc108)
…rkaround Add a workaround which sets the isolation level to 2 in CMake. The TF-M tests require the large TF-M profile because it supports the full list of crypto algorithms needed, not because of the solation level. For the TF-M tests the isolation level is irrelevant so we set it to 2 here so that we don't exclude the platforms which don't support the isolation level 3. I communicated with a TF-M maintainer and he informed me that this workaround will be included in the TF-M 2.2 release branch later so this is a short lived workaround that can be reverted when the relevant commit from the TF-M branch is cherry-picked. Signed-off-by: Georgios Vasilakis <[email protected]> (cherry picked from commit 0081207)
Starting in TF-M 2.2.0 there is a build option to treat warnings as errors. Lets use it. Signed-off-by: Flavio Ceolin <[email protected]> (cherry picked from commit ca7d99a)
z_arm_save_fp_context and z_arm_restore_fp_context save and restore fpu context regardless of the CONFIG_FPU_SHARING setting. This modification is required to support suspend to ram use cases where save and restore of FPU state is needed to ensure proper bahaviour after wakeup. Signed-off-by: Michele Sardo <[email protected]> (cherry picked from commit 5981dc8)
…mentation Following changes to arch/arm/core/cortex_m/fpu.c, the dependency on CONFIG_FPU_SHARING is moved into this file. Signed-off-by: Michele Sardo <[email protected]> (cherry picked from commit 7bc1756)
Fixup to the TF-M 2.2.0 update. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94729 Signed-off-by: Tomi Fontanilles <[email protected]>
… 3.14.0 New nrfx release contains MDK 8.72.2 and various fixes for nRF devices. Signed-off-by: Nikodem Kastelik <[email protected]> (cherry picked from commit c1d28a4)
…TCHDET GLITCHDET is not used in this file and causes issues for devices without GLITCHDET. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit a9eadb4)
Added array of analong pins for nRF54LS05B. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 2939ccd)
The following error is issued by clang when building with SPI_NOR_SFDP_RUNTIME enabled: error: fields must have a constant size: 'variable length array in structure' extension will never be supported 1379 | uint32_t dw[MIN(php->len_dw, 20)]; Instead, hardcode the array length to 20 32-bit words (it's instantiated in the stack anyway). Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 267469b)
…ency to 854" This reverts commit d0a0769. The reason for reverting this is that the only safe startup time for 54L series is the one defined in the SoC .dtsi files (1650us), and other startup times are not reliable even when tested on a particular board. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 9e52df0)
Enable Direct XIP with revert MCUboot mode through sysbuild configuration. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 7a54526)
nRF92 series is not supported in the IEEE 802.15.4 stack yet, so remove it from the board for now. Signed-off-by: Bernt Johan Damslora <[email protected]> (cherry picked from commit cb1b569)
Add revision support and overlays for rev. 0.2.0. Signed-off-by: Bernt Johan Damslora <[email protected]> (cherry picked from commit 46e9b4a)
This reverts commit a56cf02. Signed-off-by: Jamie McCrae <[email protected]>
This reverts commit 018554d. Signed-off-by: Jamie McCrae <[email protected]>
… images Adds support for images signed with SHA512. Upstream PR #: 95332 Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Jamie McCrae <[email protected]>
Increase stack size as support for SHA512 requires more data. Upstream PR #: 95332 Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Jamie McCrae <[email protected]>
This reverts commit 640dbac. Signed-off-by: Jamie McCrae <[email protected]>
… overlay" This reverts commit 73df5dd. Signed-off-by: Jamie McCrae <[email protected]>
…mised sample" This reverts commit d2ca243. Signed-off-by: Jamie McCrae <[email protected]>
nordic-piks
approved these changes
Sep 10, 2025
This reverts commit 470fcc9. Signed-off-by: Torsten Rasmussen <[email protected]>
Remove the prompt for REMOTE_BOARD. REMOTE_BOARD should not be having a prompt or be configurable on command line. Instead REMOTE_BOARD should be defined based on the SoC as this will allow creation of new boards using the same SoC, and thereby be able to build the sample out-of-the-box for any supported SoC. This allows us to remove several single line config files. For SoCs with more than two CPU clusters, such as the nRF54h20, then a choice is provided to select specific core. Remove the REMOTE_BOARD restriction, as this sample will build and run even for single core SoCs, and may be useful for testing other sysbuild multi-image features even for single cores SoCs. Upstream PR #: 95745 Signed-off-by: Torsten Rasmussen <[email protected]>
Pass on the board revision to remote image build if specified for the application image board target. Upstream PR #: 95745 Signed-off-by: Torsten Rasmussen <[email protected]>
PM support is still required for nRF53/nRF54l15 in the context of NCS. Signed-off-by: Gerard Marull-Paretas <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]>
329d8cd to
ba5b69f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove the prompt for REMOTE_BOARD.
REMOTE_BOARD should not be having a prompt or be configurable on command
line.
Instead REMOTE_BOARD should be defined based on the SoC as this will
allow creation of new boards using the same SoC, and thereby be able
to build the sample out-of-the-box for any supported SoC.
This allows us to remove several single line config files.
For SoCs with more than two CPU clusters, such as the nRF54h20, then a
choice is provided to select specific core.
Remove the REMOTE_BOARD restriction, as this sample will build and run
even for single core SoCs, and may be useful for testing other sysbuild
multi-image features even for single cores SoCs.
Upstream PR #: 95745