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

Mesh fixes upmerge 20241220 #20009

Conversation

m-alperen-sener
Copy link
Contributor

No description provided.

anangl and others added 30 commits January 20, 2025 23:31
Add corrections for a bunch of sdk-zephyr revert commits that were
cherry-picked after rebase without updating their references to
reverted commits.
Remove a no longer needed correction for one sdk-trusted-firmware-m
commit.

The added corrections can be removed after the next sdk-zephyr rebase.

Signed-off-by: Andrzej Głąbek <[email protected]>
Pull in upmerged revisions of zephyr and mcuboot.

Update other modules with related adjustments.

Signed-off-by: Andrzej Głąbek <[email protected]>
Adapt to the latest changes applied to Zephyr.

Signed-off-by: Andrzej Głąbek <[email protected]>
The bluetooth shell has been refactored (see
bf897cf941a514e7ea7a5f837d2287e360281f24), so the sourced file no longer
exists. Note that it was actually a bad use of sourcing, as the upstream
options are already part of the Kconfig tree (unless I missed
something).

Signed-off-by: Gerard Marull-Paretas <[email protected]>
- Upgrade to latest Sphinx
- Fix some references
- Fix Zephyr docset required env vars

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Align with list of inputs in upstream Zephyr.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
According to the new extension parameters.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Now the output will be $name/html|xml, so that we can generate
other outputs other than HTML only, e.g. XML.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Instead of the removed CONFIG_NRF_REGTOOL_GENERATE_BICR.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
`bt-hci-bus` property values are now specified in lowercase and without
the `BT_HCI_BUS_` prefix.

Signed-off-by: Andrzej Głąbek <[email protected]>
The ESB_DYNAMIC_INTERRUPTS option enables code that uses direct dynamic
interrupts mechanism, so it should select the DYNAMIC_DIRECT_INTERRUPTS
option together with its dependency DIRECT_INTERRUPTS, not depend on
those, otherwise some unobvious dependency loops may appear (like one
with MBOX; through NRF_RPC, MPSL_CX_SOFTWARE_RPC, NRF_FEM_ONLY, and
MBOX_ANDES_PLIC_SW).

Signed-off-by: Andrzej Głąbek <[email protected]>
This dependency introduced as a fix for cmake warnings doesn't
seem to be needed anymore but it leads to a dependency loop with
BT_CTLR_ADV_EXT_SUPPORT.
This commit basically reverts 43c4519.

Signed-off-by: Andrzej Głąbek <[email protected]>
After the latest update of the "nordic,npm1300-charger" binding,
1000 mA is the maximum value for the dischg-limit-microamp property.

Signed-off-by: Andrzej Głąbek <[email protected]>
Remove entries for the following files that were recently deleted
from the hostap module:
- crypto_mbedtls-bignum.c
- crypto_mbedtls-ec.c
- crypto_mbedtls.c
- tls_mbedtls.c

Signed-off-by: Andrzej Głąbek <[email protected]>
As the BT_LL_CHOICE choice was removed upstream, BT_LL_SOFTDEVICE
needs to be a regular option now (and not depending on BT_CTLR
anymore). Also it should select HAS_BT_CTLR as it is supposed for
all LL implemenations. See Zephyr PR 82157.

Also adjust dragoon revision accordingly.

Signed-off-by: Andrzej Głąbek <[email protected]>
- the BT_CTLR option was replaced with HAS_BT_CTLR which is selected
  by the LL implementations
- the BT_LL_CHOICE choice option was removed

See Zephyr PR 82157.

Signed-off-by: Andrzej Głąbek <[email protected]>
Bluetooth LL is now selected via devicetree so remove the obsolete
Kconfig stuff. See Zephyr PR 82157.

Signed-off-by: Andrzej Głąbek <[email protected]>
net_pkt_set_txtime() was deprecated for two Zephyr releases and has been
finally removed. net_pkt_set_timestamp_ns() is to be used instead.

Signed-off-by: Andrzej Głąbek <[email protected]>
Such configuration would lead to a recursive logging loop and a special
check catching it was introduced, so now it generates a build warning.
See Zephyr PR 78449.

Signed-off-by: Andrzej Głąbek <[email protected]>
…_uart

Follow the renaming applied in upstream Zephyr when common CDC ACM UART
configuration was introduced. See Zephyr PR 81308.

Signed-off-by: Andrzej Głąbek <[email protected]>
The BT_LL_SW_SPLIT option is now automatically enabled based on
the corresponding node ("zephyr,bt-hci-ll-sw-split" compatible)
being enabled in devicetree (and this is done by the bt-ll-sw-split
snippet).
The BT_CTLR option is deprecated in favor of HAS_BT_CTLR which is
selected accordingly by LL implementations.

Signed-off-by: Andrzej Głąbek <[email protected]>
Add an option that will make NRF_SECURITY enabled when this is required
for builds involving BT.
This is a temporary solution, just to unblock building of many samples
and tests. It is supposed to be eventually replaced with something more
suitable.

Signed-off-by: Andrzej Głąbek <[email protected]>
zephyr commit 8cfad44852845cd30336d40f61dade69ab4357db
removed the auto adv resume and deprecated the options that
were using this.

So this commit updates all uses of the deprecated options
in nrf.

Also update accordingly find-my and sidewalk modules.

Signed-off-by: Sean Madigan <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>
These macros are now provided by Zephyr (in sys_clock.h).

As these macros for mesh were defined with `unsigned long long` type
and now they are `unsigned long`, casting was added where needed to
avoid overflows.

Signed-off-by: Andrzej Głąbek <[email protected]>
Wi-Fi credentials lib has been moved to upstream. And Wi-Fi management
extension library is merged with Wi-Fi management in upstream.

Signed-off-by: Ravi Dondaputi <[email protected]>
Add default file system configuration depending on flash driver.

Signed-off-by: Maciej Baczmanski <[email protected]>
This region region is no longer enabled by default.
It must be enabled explicitly when actually used.

Signed-off-by: Andrzej Głąbek <[email protected]>
LE legacy pairing is no longer enabled by default. Samples that
use it, need to disable the BT_SMP_SC_PAIR_ONLY Kconfig option.
See Zephyr PR 73217.

Signed-off-by: Andrzej Głąbek <[email protected]>
SUIT unit tests rely on the automatically assigned volatile key IDs.
Since the key IDs changes with the amount of allowed keys, we should not
change it without regenerating all test payloads.
The new Zephyr brings a Kconfig to control this variable and changes the
default amount from 32 to 16, so the SUIT test platform needs to
override it back to the previous default value.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Commit adapts configuration ble mesh, trusted storage and
mbedtls psa parameters to be able to run mesh samples
and tests.

Signed-off-by: Aleksandr Khromykh <[email protected]>
maciejbaczmanski and others added 9 commits January 20, 2025 23:35
Remove `zephyr,priority` as it is not needed after switching to
ipc,icbmsg.

Signed-off-by: Maciej Baczmanski <[email protected]>
hostap has now removed support for CRYTPO, only CRYPTO_ALT is supported
as the MbedTLS shim.

Switch to ALT version of legacy PSA for TF-M/54L builds.

Signed-off-by: Chaitanya Tata <[email protected]>
Add the missing legacy ALT case.

Signed-off-by: Chaitanya Tata <[email protected]>
This deprecated option was finally removed. See Zephyr PR 82398.
Remove references to it and, where needed, replace it with POSIX_API.

Signed-off-by: Andrzej Głąbek <[email protected]>
This sample require entropy from Zephyr, in nRF54h20
this is provided by PSA RNG driver and from the secure domain.

The PSA RNG driver brings IPC dependencies which increase the
flash footprint of this sample and this was not an acceptable
increase for the mainttainers of the sample.

It was concluded that as a temporary solution this sample  will keep
using the non cryptographically secure, deterministic software RNG.

The dependency on the PRNG node needs to be removed later and it is
tracked in NCSDK-30805.

Signed-off-by: Georgios Vasilakis <[email protected]>
Use legacy recovery PRNG in SUIT recovery application since the PSA
variant consumes more memory and the recovery application is meant to be
minimal.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
PSA requires RNG to be enabled.

Signed-off-by: alperen sener <[email protected]>
Increasing the stack sizes for increased requirement due to MBEDTLS PSA.
And removing CONFIG_BT_TINYCRYPT_ECC since MBEDTLS is default now.

Signed-off-by: alperen sener <[email protected]>
Light ctrl samples is not able to fit on nrf52832 anymore due to
increased RAM usage by MBEDTLS PSA.

Signed-off-by: alperen sener <[email protected]>
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. labels Jan 21, 2025
@NordicBuilder
Copy link
Contributor

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

Name Old Revision New Revision Diff
dragoon f4f268ce33699c0889e295520777b00a93aab5a3 develop/DRGN-23817_adapt_for_upmerge_20241220 N/A
find-my https://github.com/nrfconnect/sdk-find-my/commit/75b94d3e9b8abe038d38ed9f8b233155b9b06722 (main) https://github.com/nrfconnect/sdk-find-my/pull/260 nrfconnect/sdk-find-my#260/files
matter nrfconnect/sdk-connectedhomeip@7e94f1c (master) nrfconnect/sdk-connectedhomeip#528 nrfconnect/sdk-connectedhomeip#528/files
mcuboot nrfconnect/sdk-mcuboot@99d4ae9 (main) nrfconnect/sdk-mcuboot#393 nrfconnect/sdk-mcuboot#393/files
sidewalk nrfconnect/sdk-sidewalk@f274ce8 nrfconnect/sdk-sidewalk#673 nrfconnect/sdk-sidewalk#673/files
zephyr nrfconnect/sdk-zephyr@20a2ba2 nrfconnect/sdk-zephyr#2411 nrfconnect/sdk-zephyr#2411/files

DNM label due to: 5 projects with PR revision and 1 unreachable repo

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

@NordicBuilder
Copy link
Contributor

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 1

Inputs:

Sources:

more details

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (0)

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ❌ Toolchain
  • ❌ Build twister
  • ❌ Integration tests

Note: This message is automatically posted and updated by the CI

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. DNM doc-required PR must not be merged without tech writer approval. manifest manifest-dragoon manifest-find-my manifest-matter manifest-mcuboot manifest-sidewalk manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.