Skip to content

[nrf fromtree] modules: hal_nordic: Added explicit enum values #2529

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
wants to merge 2,337 commits into
base: main
Choose a base branch
from

Conversation

Rafal-Nordic
Copy link
Contributor

minor change for better maintenance

Upstream PR #: 86032

gmarull and others added 30 commits February 12, 2025 11:29
New Twister schema is not supported yet in sdk-zephyr, drop this patch
once Twister is updated.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit d1ded33)
… map"

This reverts commit c37deeb.

This is only a temporary change, until we align our CI. To be removed
once natsort is avaialble in the NCS CI.

Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 374374b)
Kconfig search is handled in a separate docset in NCS, so remove the
page. This is a long-term noup patch.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Krishna T <[email protected]>
(cherry picked from commit 3fe805d)
-This allows configurations enabled by PSA_WANTS_ALG_XXXX to be
 used to control which TF-M module is enabled
-If the TF-M image doesn't support e.g. the MAC APIs, then the
 MAC interface is not enabled

Note: This functionality requires that nrf_security is enabled

ref: NCSDK-11689

Make TF-M crypto module depend on PSA_WANT_GENERATE_RANDOM, same
as all other crypto modules, which have PSA_HAS to group all PSA
features that require the module.
This makes TF-M by default exclude the RNG module when not needed.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 676d548)
Out-of-tree crypto subsystems need to deselect MBEDTLS_BUILTIN, but
deselection is not supported. It is however supported to select a
dependency in a ! expression.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 5a62fe9)
We moved the header files in sdk-mbedtls from the library
folder to the include/library folder. This was done to avoid
issues when building MbedTLS with the nrf_security module
and the Oberon PSA core. The Oberon PSA core provides a subset
of these header files and since they are included with quotes
we cannot have them in the same directory.
This change make the needed adaptions in CMake for the
applications that don't use nrf_security.

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
(cherry picked from commit 801154a)
Update Kconfig options for qualification:
 - Remove experimental on qualified feature.
 - Add experimental on unqualified feature.
 - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it
   downstream.

Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Ingar Kulbrandstad <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Herman Berget <[email protected]>
Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit e92e87d)
The commits adds support for generating flash disks from Partition
Manager defined partitions.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 1601992)
The "zephyr-code-partition" chosen DTS node cannot be used when build
uses Partition Manager. In that case, mcumgr must rely on the
definitions provided by the Partition Manager.

Jira: NCSDK-21381

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 763a188)
The commit adds bootutil hook, for nrf5340, to allow it
handling the non-accessible image-1/primary slot.

Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 7b33eaf)
Move it inside ifdef.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 44b6e2c)
Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit beecaaa)
Migrates child image configuration for this sample over to sysbuild

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 6199743)
This is a follow-up to commit 9dd570f.

Since in NCS, unlike in vanilla Zephyr, the nano variant of newlib
is the default one, restore entries that disable the nano variant
in one sample and one test that require the full newlib variant.
This patch is supposed to be removed when picolibc becomes the default.

Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit cb05ba5)
Disables partition manager when building some samples and tests
which use sysbuild to prevent build issues

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit cd344ab)
Add a Kconfig for th TFM_CRYPTO_PAKE_MODULE_ENABLED to support the PAKE
APIs.

noup as the PAKE support including the PAKE module doesn't exist yet in
upstream TF-M as they depend on mbed TLS support for it

Ref: NCSDK-22416
Signed-off-by: Markus Swarowsky <[email protected]>
(cherry picked from commit eb58994)
Friend's replies on LPN's polls do not assume randomization in
advertiser. Zero randomization will help to optimize time when
LPN keeps receiving window open and save power.

Signed-off-by: Aleksandr Khromykh <[email protected]>
(cherry picked from commit 6d82661)
Fixes issue where randomness can be removed for advertising sets that
have to handle other adv types than the BT_MESH_FRIEND_ADV tag type.

Signed-off-by: Anders Storrø <[email protected]>
Signed-off-by: Aleksandr Khromykh <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 8709818)
…N_MANAGER

Active partition ID need to be extracted basing on PARTITION_MANAGER
products.

ref.:NCSDK-26693

Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit a7b53d1)
(cherry picked from commit d99f13e)
Using a comment to explain Kconfig options make them
invisible to Kconfig search. Use help instead.

Signed-off-by: Sigurd Hellesvik <[email protected]>
(cherry picked from commit 2bff40a)
Added overlay with m25r64 on-DK memory selecton.
This aim to support testing DFU with secondary partition moved to the
external flash.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit f8b30ba)
Necessary changes for NCS CI.

- Add a Jenkinsfile
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- compliance.yml: Disable check for merge commits, since we have upmerges
downstream. Also, since in the code we refer to Kconfig symbols that are defined
in the sdk-nrf repository, the Kconfig checks (Kconfig, KconfigBasic and
KconfigBasicNoModules) will not pass so exclude them. Also, disable any
maintainers-related checks
- scripts/gitlint: Extend the max commit line lengths for Gitlint to account
for sauce tags
- Adapt to the changes in:
nrfconnect/action-commit-tags#4

Signed-off-by: Carles Cufi <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Krishna T <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit ef75b3e)
There is no point to use PICOLIB here as it bloats the tests.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 1fb551a)
Provides an option to enable TLS session caching for an MQTT
client's secure socket.

Signed-off-by: Jan Tore Guggedal <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 3272269)
This commit adds an extra parameter in the configuration
structure to configure native TLS support at runtime.

Signed-off-by: Mirko Covizzi <[email protected]>
(cherry picked from commit 640fd0c)
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 nRF53

Signed-off-by: Markus Swarowsky <[email protected]>
(cherry picked from commit 8315b87)
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 <[email protected]>
Signed-off-by: Georgios Vasilakis <[email protected]>
(cherry picked from commit 0107d28)
Change introduces common static Partition Manager configuration.
The tfm_nonsecure partition must be SPU region aligned.

Ref: NCSDK-18033
Ref: NCSDK-19515

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
(cherry picked from commit 4f1f83b)
Enabling USB CDC by default in Thingy:53 board configuration
caused that there were two instances of USB CDC in MCUBoot. Change
disables one instance which was added automatically by NCS if
MCUBoot bootloader was built as a child image.

Jira: NCSDK-18596

Signed-off-by: Mateusz Kapala <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit f01f472)
Change enables MCUboot bootloader by default to allow programming
samples and applications without external programmer (using MCUboot
serial recovery). Change also enables network core to prevent build
failures when building MCUboot with nRF53 multi image DFU.

Jira: NCSDK-18263

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 1e7e8ed)
nordicjm and others added 21 commits February 17, 2025 14:18
Adds support for prefixing files with the target of bl2 or tfm

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit f804469)
Add Nordic platforms and rename the defines
to avoid redefining a nrf driver internal symbols

Signed-off-by: Piotr Krzyzanowski <[email protected]>
(cherry picked from commit 09d5b9d)
Improve test stability in 54l15 case
by measuring duty cycle after two periods

Signed-off-by: Piotr Krzyzanowski <[email protected]>
(cherry picked from commit cb7690a)
…ration for nrf54h20

Extend CONFIG_SKIP_EDGE_NUM.

Signed-off-by: Piotr Kosycarz <[email protected]>
(cherry picked from commit e3e4548)
…BT_HCI_RAW

In zephyrproject-rtos/zephyr#84268
the ability to use the controller for ECDH was removed from
the host.

This means that BT_CTLR_ECDH is now only useful when using
BT_HCI_RAW.

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 706938d)
Recently I have had to debug issues with PSA and having
the returns values from PSA is very useful in order to
find the root cause of the issue.

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 8cff70a)
…baudrate enum

Add faster baudrates (2M, 4M and 8M).

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit e737895)
Rename UARTE_ANY_FAST to UARTE_ANY_FAST_PD. There are 2 types of
'fast' UARTE instances. In nrf54h20 instance uart120 is in fast
power domain that requires additional power and clock management
of that domain. In nrf54lx fast uart00 instance does not require
that. Add _PD to indicate fast power domain.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 1573be5)
…udrates

nrf54x devices have UARTE instance capable of using baudrate higher
than 1M. Higher baudrates does not have predefined values for
BAUDRATE register. A formula can be used to calculate BAUDRATE
value that shall be used for desired baudrate. Add UARTE_ANY_HIGH_SPEED
macro which is set when high speed is enabled (uart00 in nrf54lx or
uart120 in nrf54h20). For high speed instance use formula for getting
value that shall be written to BAUDRATE register.

When runtime configuration is not used then same formula is used to
calculate fixed BAUDRATE value.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 972ec82)
Fast instance in nrf54h (uart120) can generate a spurious RXTO event
some time after RXTO event that indicates that RX path is disabled.
The time when event is generated depends on baudrate and when slower
baudrates are used peripheral is disabled on time to not notice it
in the test but with higher baudates issue become visible. In order
to avoid spurious interrupt, RXTO interrupt is disabled during RXTO
event handling and enabled when RX is enabled. This workaround is
applied only for fast instance to avoid unnecessary register
accesses for slower instances.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit e235e7b)
…abort test

Test was staring a TX transfer and aborting it after 300 us from
the timer handler. Test was assuming that ongoing transfer will
not finish in those 300 us. This might not be true for higher
baudrates. Instead of using fixed timeout, a value is calculated
from the baudrate and targets to abort the transfer after approx.
20 bytes of 95 byte long transfer.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 38c129d)
…rf54h20dk uart120

Use high baudrate when testing uart120 on nrf54h20dk/nrf54h20/cpuapp.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit fe6a4d0)
Changes the priority of imgtool so that the preferred version is
the one inside of the MCUboot directory

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 6db2c86)
Uses imgtool which has already been located by zephyr

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

Adds API for Advertising Coding Selection.

Introduces two new advertising options to configure the advertiser's
requirement concerning coding scheme when LE Coded PHY is configured.
While the Bluetooth v6.0 specification makes a distinction betweeen
preferred and required advertising PHY options, a simplification is
made to only expose the required PHY options. Inline with how LE Coded
PHY is implemented; this API will set both the primary and secondary
advertising PHY's to the same coding scheme.

The support is enabled by CONFIG_BT_EXT_ADV_CODING_SELECTION, and requires
a controller that selects CONFIG_BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT.

Signed-off-by: Thomas Deppe <[email protected]>
(cherry picked from commit f3bdd2b)
…ng Selection

Extends the API for Advertising Coding Selection.

The API is extended to set the Advertising Coding Selection
(Host Support) bit. With this feature, the primary and
secondary PHY can now explicitly report S=2 or S=8 coding
in the extended advertising report. Previously, the report
only indicated LE Coded regardless of whether S=2 or S=8
data coding was used. The API now sets the host support bit
and ensures that the advertising PHY coding scheme is
conveyed to the application via the scan callback.

The support is enabled by CONFIG_BT_EXT_ADV_CODING_SELECTION,
and requires a controller that selects
CONFIG_BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT.

Signed-off-by: Thomas Deppe <[email protected]>
(cherry picked from commit dcbcbe8)
This adds temporary entropy driver simulation for
nRF54l09 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Signed-off-by: Rafał Kuźnia <[email protected]>
…opback too

A test is going to use this UART also, so we'll need it.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit dc87bb0)
Add the fast uart instance of 54l15 for testing

Signed-off-by: Piotr Krzyzanowski <[email protected]>
(cherry picked from commit 6d8eb18)
…ck issue

In 923d313 the clock frequency in DTS
for the UART00 was fixed, but not for the simulated target. This was
likely due to the HW models modeling it as 16MHz instead of 128MHz for
this particular one as it is in reality.

Now that the HW models have been fixed, let's let this clock be
configured like for real HW.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 5e7df92)
Disable insted of deletion of spi00 node on 54l15bsim

Signed-off-by: Piotr Krzyzanowski <[email protected]>
(cherry picked from commit ae80fb1)
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 19, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@ecea8cd zephyrproject-rtos/hal_nordic#277 zephyrproject-rtos/hal_nordic#277/files

DNM label due to: 1 project with PR revision

Note: This message is automatically posted and updated by the Manifest GitHub Action.

minor change for better maintenance

Upstream PR #: 86032

Signed-off-by: Rafal Dyla <[email protected]>
@Rafal-Nordic Rafal-Nordic force-pushed the NRFX-6879_Explicit_enum_values branch from d984c25 to c5b4777 Compare February 19, 2025 18:33
Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

this isn't a fromtree if it has pull/x/head in the manifest

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.