Open
Conversation
… peer" This reverts commit 63e52b8. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 206c0ef. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 93d8bf5. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 258c757. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 4c7aba3. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit f1d901d. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 8e1b363. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit b9d5d9f. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 30cd628. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…efault" This reverts commit e89fd5f. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 9a1090d. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…enable" This reverts commit df055b3. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 9f8e4ed. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit f760d80. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 38f7a5f. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
… TX is done" This reverts commit 44a4659. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 8b6ec77. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 74ca5f8. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…igs" This reverts commit fe5d6ad. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…ide" This reverts commit cf7c4d3. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit c82c428. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 473385a. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 488c9ff. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…ling" This reverts commit fa2b950. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 56d74c7. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit a3ea677. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…54L15" This reverts commit 5fe83a2. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit abe30cf. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 91df299. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This reverts commit 3f9d391. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
…move X nrf-squash! [nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS The Kconfig was changed upstream. Align usage in our noups. Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no> (cherry picked from commit 8f08a9a)
…ve X nrf-squash! [nrf noup] samples: sysbuild: hello_world: support PM on nRF53 The Kconfig was changed upstream. Align usage in our noups. Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no> (cherry picked from commit 4d28ae7)
nrf-squash! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions This feature conflicts with PM, prevent it being used when PM is enabled Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 9a111ef)
nrf-squash! [nrf noup] dts: choose a crypto accelerator for entropy Also the underlying patch should never have been added to sdk-zephyr Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit aeccbe4)
nrf-squash! [nrf noup] boards: nordic: nrf7002dk: Bring back NS variants Fixes include files so that they use the new updated paths Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 529a26d)
Make MQTT `set_native_tls` option work w/o socket dispatcher enabled. Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit 8025e2e)
nrf-squash! [nrf noup] scripts: ci: check_compliance: Check Kconfigs for enable Fixes some issues that ruff is now showing Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 6e23506)
nrf-squash! [nrf noup] ci: set ZEPHYR_<MODULE_NAME>_KCONFIG for NCS modules Fixes some issues that ruff is now showing Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 62c751a)
nrf-squash! [nrf noup] scripts: ci: check_compliance: Add undefined Kconfigs Fixes some issues that ruff is now showing Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 78357fa)
nrf-squash! [nrf noup] scripts: ci: check_compliance: Add NCS sysbuild Kconfigs Fixes some issues that ruff is now showing Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 9749b5c)
nrf-squash! [nrf noup] scripts: west: build: Use sysbuild by default if in NCS dir New feature Supports cmake options specified via arguments changed default sysbuiild from None to []. Noup commit to use sysbuild by default if in NCS dir requires changes to accommodate this. Signed-off-by: Robert Robinson <robert.robinson@nordicsemi.no> (cherry picked from commit ba740b9)
update OTA documentation Signed-off-by: Uma Praseeda <uma.praseeda@nordicsemi.no> (cherry picked from commit 5a157b3)
nrf-squash! [nrf noup] soc/nordic/nrf54h/pm_s2ram: S2RAM resume hardening Use only offsets to the base and not the full address. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit d9e419d)
Fixes issues with handling fixed partitions that use the correct method of inheriting the parent's address. Also updates the test so that it uses this properly, and adds in checks so that invalid (and deprecated) handling is checked to ensure it has not broken Upstream PR #: 103631 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 0bfdaab)
Fixes wrongly taking the absolute address of the partition when the relative address was needed Upstream PR #: 103631 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 8426260)
Fixes testing on devices that use sub-partitions for the partition Upstream PR #: 103631 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit e12a466)
Set PSA as the entropy source for nRF54lm20a target. PSA is the only NCS-supported interface to CRACEN. There is no other entropy source in 54lm20a than CRACEN. The commit also disables `rng` compatible with `nrf-cracen-ctrdrbg`, the nrfx based interface to CRACEN that is used in upstream Zephyr. Only one CRACEN interface may be enabled. Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no> (cherry picked from commit e5c923a)
The SoftDevice Controller is a different controller than the open source link layer with a different set of quirks. The SoftDevice Controller is a default BT controller in nRF Connect SDK context, therefore it should be enabled by default instead of open source link layer. The commit changes the default BT controller for nRF54lm20a SoC. Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no> (cherry picked from commit 3c80c15)
The default TF-M profile in NCS was changed from MINIMAL (an NCS construct) to NOT_SET. The Thingy:53 has static PM files which give little space for TF-M so it needs to continue defaulting to the minimal TF-M profile. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit 75a8753)
nrf-squash! [nrf noup] dts: Add Bluetooth Controller to nRF54H20 Formatting problem from upmerge causing error during any PR to nrf54h20 file. Signed-off-by: David Jewsbury <david.jewsbury@nordicsemi.no> (cherry picked from commit b839e83)
Set PSA as the entropy source for nRF7120 target. PSA is the only NCS-supported interface to CRACEN. Disables `rng` compatible with `nrf-cracen-ctrdrbg`, the nrfx based interface to CRACEN that is used in upstream Zephyr. Only one CRACEN interface may be enabled. Signed-off-by: Robert Robinson <robert.robinson@nordicsemi.no> (cherry picked from commit 8334d4c)
nrf-squash! [nrf noup] dts: Select SoftDevice Controller DTS binding as default Sets bt_hci_sdc as default for nRF7120. Signed-off-by: Robert Robinson <robert.robinson@nordicsemi.no> (cherry picked from commit 42cd30f)
nrf-squash! [nrf noup] mbedtls: Add dependency logic for PSA crypto configurations Partially reverts some Kconfig changes which can be applied in sdk-nrf instead Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 308954d)
stale_issue.yml: repo changed Signed-off-by: Leif Harald Urlaub <leif.harald.urlaub@nordicsemi.no> (cherry picked from commit 5870504)
…plementation Add Kconfig entries to allow compile own s2ram implementation. Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no> Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Signed-off-by: Pasi Liimatainen <pasi.liimatainen@nordicsemi.no> (cherry picked from commit 8820ca6)
Add common mapping to sample.yaml. Upstream PR #: 105141 Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> (cherry picked from commit 90bb568)
…s already registered Return -EALREADY if the class instance already registered, which, in some circumstances, may be considered a non-critical error. Upstream PR #: 105141 Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> (cherry picked from commit 220b6b8)
… instances Application can use new option CDC_ACM_SERIAL_MULTIPLE_INSTANCES if different CDC ACM serial backends are required for common use cases such as logging, the shell, and specific protocols. This option also guarantees the order in which the instances will be registered and appear in the configuration descriptor. The option uses the chosen node properties to identify UART devices. The following are currently supported, in this order: "zephyr,console", "zephyr,shell-uart", "zephyr,uart-mcumgr". A supported property may be missing, and properties may reference the same device. Upstream PR #: 105141 Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> (cherry picked from commit d088ff9)
TF-M will uses SPU alignment during build time to make sure all partitions can be locked down with the SPU. So adding them for nRF91 The nRF54L15 doesn't use the SPU for setting the security attributes for flash/RAM regions. In order to avoid having multiple Kconfigs with similar meaning renamed the alignment Kconfig option to something more generic in order to use the same symbol for all the TrustZone enabled devices. Ref: NCSDK-25023 Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no> Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> (cherry picked from commit 10314a5)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Regular upmerge.
manifest-pr-skip