Upmerge 2024.12.20 #19720
Open
Upmerge 2024.12.20 #19720
+116
−123
Conversation
This file contains 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
|
The following west manifest projects have changed revision in this Pull Request:
⛔ DNM label due to: 2 projects with PR revision Note: This message is automatically posted and updated by the Manifest GitHub Action. |
anangl
force-pushed
the
upmerge_20241220
branch
from
18c283b to
b8faff3
Compare
|
#19200 should be merged first (other repos need the same update, will open PRs) |
|
3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge) |
anangl
force-pushed
the
upmerge_20241220
branch
from
b8faff3 to
2cd1bec
Compare
github-actions
bot
added
the
doc-required
anangl
force-pushed
the
upmerge_20241220
branch
2 times, most recently
from
e829967 to
00df919
Compare
done |
anangl
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
f315d52 to
22726df
Compare
anangl
force-pushed
the
upmerge_20241220
branch
from
22726df to
1b276e2
Compare
anangl
requested review from
sachinthegreen,
krish2718 and
a team
as code owners
anangl
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
45aba6a to
164d42f
Compare
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. 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]>
anangl
force-pushed
the
upmerge_20241220
branch
from
164d42f to
d4f99fe
Compare
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. Signed-off-by: Andrzej Głąbek <[email protected]>
The BT_LL_CHOICE choice was removed upstream and the BT_CTLR option was replaced with HAS_BT_CTLR. 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]>
anangl
force-pushed
the
upmerge_20241220
branch
from
d4f99fe to
c812bf4
Compare
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]>
anangl
force-pushed
the
upmerge_20241220
branch
from
c812bf4 to
2a8999c
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.
Pull in upmerged revisions of zephyr and mcuboot.