forked from nrfconnect/sdk-nrf
-
Notifications
You must be signed in to change notification settings - Fork 0
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
kconfig.nrf: NRF_SECUIRTY_ENABLER to enable MBEDTLS_ENABLE_HEAP #42
Open
sean-madigan
wants to merge
91
commits into
anangl:upmerge_20241220
Choose a base branch
from
sean-madigan:upmerge_psa_fixes
base: upmerge_20241220
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
kconfig.nrf: NRF_SECUIRTY_ENABLER to enable MBEDTLS_ENABLE_HEAP #42
sean-madigan
wants to merge
91
commits into
anangl:upmerge_20241220
from
sean-madigan:upmerge_psa_fixes
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
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]>
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]>
- Set missing configs to get tests running - Changed define for broadcast_code as per migration guide - OCT-3172
Fixes an issue with this test wrongly using 0 as the area size Signed-off-by: Jamie McCrae <[email protected]>
Output uses logging, which has no guarantee of even being enabled or supported Signed-off-by: Jamie McCrae <[email protected]>
`native_sim/native` needs to be used now instead of `native_sim`. Support for MCUboot RAM load mode is to be added later so for now the related test scenario in the mcumgr sample is quarantined. Signed-off-by: Maciej Perkowski <[email protected]> Signed-off-by: Andrzej Głąbek <[email protected]>
So far when building for nRF54L15 static DPPI channels were assigned. After adding nRF54L15 support in the DPPI driver this code is unused for nRF54L15 and the common DPPI allocator used hardcoded DPPIC instance. This commit parameterizes the DDPIC instance number depending on the SoC and enables the coresponding instances in the ESB samples' configurations. ESB uses hardcoded instance number per SoC. TODO: Allow selection of the DPPIC instance in one place e.g. Kconfig based on the DTS. Signed-off-by: Michał Grochala <[email protected]>
- Change posix names to zsock. - Remove CONFIG_x_NRF_HW_ASYNC usage. - Correct size for the external flash. Signed-off-by: Markus Lassila <[email protected]>
Function has been deprecated in upstream zephyr, so remove from here. Signed-off-by: Sean Madigan <[email protected]>
ef26185
to
55fe3cd
Compare
MBEDTLS_ENABLE_HEAP is required by nrf PSA in more situations than upstream, so enable this here. Also PSA_WANT_GENERATE_RANDOM is required whenever BT_ECC is set, so add this. Signed-off-by: Sean Madigan <[email protected]>
26fef85
to
87f192d
Compare
cef2ee0
to
c701a28
Compare
eae42a3
to
9f410d5
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.
MBEDTLS_ENABLE_HEAP is required by nrf PSA in more situations than upstream, so enable this here.
Also PSA_WANT_GENERATE_RANDOM is required whenever BT_ECC is set, so add this.