Skip to content

Conversation

Vge0rge
Copy link

@Vge0rge Vge0rge commented Sep 12, 2025

Disable the KMU by default for all the NRF54L devices for this test. With the current configuration this test is incompatible with the KMU because it changes the placement of the RAM in the linker files and this collides with the KMU logic. But it also does not need the KMU so there is no need to be there.

This is a noup because the configuration (and KMU support) is only placed in ncs.

The KMU dependency to reserve the top RAM address is planned to be done in dts (NCSDK-31980). Hopefuly when this is done this noup can be removed.

…lays with miso/mosi"

This reverts commit 722d5bc.

Signed-off-by: Jukka Rissanen <[email protected]>
…CE_ macros"

This reverts commit 7d657f6.

Signed-off-by: Jukka Rissanen <[email protected]>
…low lp mode"

This reverts commit 971e2e3.

Signed-off-by: Jukka Rissanen <[email protected]>
…y pin"

This reverts commit 723be97.

Signed-off-by: Jukka Rissanen <[email protected]>
…modify error checking"

This reverts commit 27f9e51.

Signed-off-by: Jukka Rissanen <[email protected]>
…1304 devices"

This reverts commit 99296da.

Signed-off-by: Jukka Rissanen <[email protected]>
… changes"

This reverts commit 393d9d8.

Signed-off-by: Jukka Rissanen <[email protected]>
…rom npm1300"

This reverts commit 0ebf534.

Signed-off-by: Jukka Rissanen <[email protected]>
…d problems with LTO"

This reverts commit dec4c5b.

Signed-off-by: Jukka Rissanen <[email protected]>
…IZE for thread stacks"

This reverts commit 2d0c2aa.

Signed-off-by: Jukka Rissanen <[email protected]>
…ic functions"

This reverts commit a2838ea.

Signed-off-by: Jukka Rissanen <[email protected]>
…ether to apply Errata 56"

This reverts commit f328a81.

Signed-off-by: Jukka Rissanen <[email protected]>
…needed"

This reverts commit fb23f7c.

Signed-off-by: Jukka Rissanen <[email protected]>
…urad_hsfll"

This reverts commit 2322f1f.

Signed-off-by: Jukka Rissanen <[email protected]>
…rol enabled"

This reverts commit 69ba6b5.

Signed-off-by: Jukka Rissanen <[email protected]>
…r driver"

This reverts commit 1b2f57c.

Signed-off-by: Jukka Rissanen <[email protected]>
…nding names"

This reverts commit ac70df0.

Signed-off-by: Jukka Rissanen <[email protected]>
…startup_time desc"

This reverts commit 8242754.

Signed-off-by: Jukka Rissanen <[email protected]>
…les in single line mode"

This reverts commit 0b6756b.

Signed-off-by: Jukka Rissanen <[email protected]>
tomi-font and others added 17 commits September 12, 2025 10:15
noup because it's about partition manager.

Fix the build of secure_storage.psa.its.secure_storage.store.zms on
nrf54l15dk/nrf54l15/cpuapp by disabling partition manager, which is
incompatible with the ZMS implementation of the ITS store module.

Disabling it only for that test as it's not needed for the others
and even makes the NS board targets fail if disabling PM.

Signed-off-by: Tomi Fontanilles <[email protected]>
(cherry picked from commit eb02a02)
Added additional cleanups between tests, which fixed the issue
of a failing testcase on nRF54L15.

Upstream PR #: 93927

Signed-off-by: Michał Bainczyk <[email protected]>
(cherry picked from commit d24c26f)
nrf-squash! [nrf noup] soc: nrf54l: Add custom section for KMU

Change how the KMU reserved area is included in the
linker file. Now there is a separate Kconfig which
shows it the there is a dts entry for the KMU
reserved area.

Signed-off-by: Georgios Vasilakis <[email protected]>
(cherry picked from commit 793e93e)
Add ENTROPY_GENERATOR=y in overlays for l series devices.
This fixes an error where a trng source is not included in ncs.

Signed-off-by: Dag Erik Gjørvad <[email protected]>
(cherry picked from commit 6997770)
Upstream PR #: 94330

* Explicitly skip tests that depend on CONFIG_ZMS_LOOKUP_CACHE.

* In `testcase.yaml`, use `extra_configs` instead of `extra_args` for
  setting Kconfigs.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 664645d)
Upstream PR #: 94330

Allow the ZMS API to optionally accept 64 bit IDs. A typedef `zms_id_t`
is added, so that the maximum ID width can be controlled using Kconfig.

The current ATE structure is already large enough that it is possible to
reserve 64 bits for IDs without increasing its total size (128 bits).
This makes the feature a natural, low footprint alternative to Settings,
for cases where the supported key namespace must be larger than 32 bit
but not arbitrarily large.

The ATE format does have to be altered to accommodate larger IDs, but
the default "32 bit" format is left as is. Now, the `struct zms_ate`
describes one of two supported formats, selected by an `#if` condition.
In the future, it may be possible to support multiple ATE formats at
runtime, in which case the structure can be turned into a union.

In the new, "64 bit" ATEs, the `offset` and `metadata` fields are moved
into a union, because they are found to be mutually exclusive. With the
old format, the same fields are in different locations, but one of them
always gets filled with a dummy value, depending on the given ATE type.
To cover both cases, a `memset` is used, which should be optimized away
by the compiler when appropriate.

The only limitation is that the new ATE format has no room for data CRC,
but an alternative integrity check can be implemented by the caller.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 019a9eb)
Upstream PR #: 94330

* Update the "corrupt ATE" tests to work with the new ATE format.

* Add a basic test to verify support to 64 bit ZMS IDs.

* Add a `testcase.yaml` entry to cover the above points and also run
  lookup cache tests to evaluate the 64 bit hash function.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit d9e38a9c4521e9b4423526e2c8e91b64f15928c7)
(cherry picked from commit 9311d96)
ZMS legacy enabled by CONFIG_SETTINGS_ZMS_LEGACY uses a different lookup
cache function that is optimized for Settings subsystem.

Signed-off-by: Riadh Ghaddab <[email protected]>
(cherry picked from commit 476ad66)
This patch should be dropped as part of the next upmerge.

The upcoming release of IronSide SE no longer disables RETAIN
in all GPIO instances on boot, so the application must be able
to handle the hardware default state of RETAIN being enabled.

The GPIO retention is properly handled by changes that are
currently only upstream and will be pulled in by the next upmerge.
This patch exists a workaround to be able to integrate
IronSide SE before the proper solution is pulled in.

Signed-off-by: Jonathan Nilsen <[email protected]>
(cherry picked from commit 20d89eb)
…ge dump

If test is to be run in coverage mode, wait for output to
dump at the end of a failing testcase.

Upstream PR #: 95162

Signed-off-by: Michał Stasiak <[email protected]>
(cherry picked from commit 103b06a)
Allows listing sysbuild Kconfigs for SoCs

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 1d73d0e)
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]>
(cherry picked from commit b48a1f2)
This is needed for any Kconfig processing

Upstream PR #: 95771

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 2fc387e)
Loads this file in a better way that means samples and modules
should not have to source the file before referencing Kconfig
module path variables

Upstream PR #: 95771

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 25ced41)
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 <[email protected]>
Set PSA as the entropy source for nRF54lm20a target.
PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Piotr Pryga <[email protected]>
Disable the KMU by default for all the NRF54L devices for this
test. With the current configuration this test is incompatible
with the KMU because it changes the placement of the RAM in the
linker files and this collides with the KMU logic. But it also
does not need the KMU so there is no need to be there.

This is a noup because the configuration (and KMU support) is
only placed in ncs.

The KMU dependency to reserve the top RAM address is planned
to be done in dts (NCSDK-31980). Hopefuly when this is done
this noup can be removed.

Signed-off-by: Georgios Vasilakis <[email protected]>
@jukkar jukkar force-pushed the meta-upmerge branch 11 times, most recently from baf7586 to ca249e5 Compare September 19, 2025 12:50
@jukkar jukkar force-pushed the meta-upmerge branch 2 times, most recently from d913aed to d792280 Compare September 23, 2025 07:56
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.