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

Wifi kconfig fixes #20097

Draft
wants to merge 73 commits into
base: main
Choose a base branch
from
Draft

Wifi kconfig fixes #20097

wants to merge 73 commits into from

Conversation

frkv
Copy link
Contributor

@frkv frkv commented Jan 28, 2025

Misc fixes (will stay as a draft)

anangl and others added 30 commits January 27, 2025 16:10
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 <andrzej.glabek@nordicsemi.no>
Pull in upmerged revisions of zephyr and mcuboot.

Update other modules with related adjustments.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Adapt to the latest changes applied to Zephyr.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
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 <gerard.marull@nordicsemi.no>
- Upgrade to latest Sphinx
- Fix some references
- Fix Zephyr docset required env vars

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Align with list of inputs in upstream Zephyr.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
According to the new extension parameters.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
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 <gerard.marull@nordicsemi.no>
Instead of the removed CONFIG_NRF_REGTOOL_GENERATE_BICR.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
`bt-hci-bus` property values are now specified in lowercase and without
the `BT_HCI_BUS_` prefix.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
- 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 <andrzej.glabek@nordicsemi.no>
Bluetooth LL is now selected via devicetree so remove the obsolete
Kconfig stuff. See Zephyr PR 82157.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <sean.madigan@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <ravi.dondaputi@nordicsemi.no>
Add default file system configuration depending on flash driver.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
This region region is no longer enabled by default.
It must be enabled explicitly when actually used.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
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 <andrzej.glabek@nordicsemi.no>
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 <tomasz.chyrowicz@nordicsemi.no>
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 <aleksandr.khromykh@nordicsemi.no>
sean-madigan and others added 12 commits January 27, 2025 16:22
The dependencies for ISO kconfigs have changed so now we
need to manually select CONFIG_BT_CENTRAL and
CONFIG_BT_PERIPHERAL.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
After switching IPC to icbmsg, the `zephyr,priority` property is
no longer present in the IPC node and there is no need to adjust
the WQ priority.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
... as it is not used anyway. This saves some flash bytes and makes
the the mcuboot image fit its partition again.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
- Change API and defines based on changes in upstream Zephyr
- OCT-3172

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
The CONFIG_NRFX_GPPI symbol was only added for specific boards
but the GPPI implementation is used unconditionally on all platforms.
Align configuration files in DTM and RT to reflect this situation.

Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no>
To align with upstream boards that use nRF53 and nRF91 and to get
node labels for shared memory regions (cpuapp_cpunet_ipc_shm and
cpunet_cpuapp_ipc_shm) defined.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
CONFIG_SOC_ENABLE_LFXO has been deprecated in zephyr in
favour of a DT_NODE, so update the handling of this in
empty_app_core sample.

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>
Now the function requires additional parameter with the socket number.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This sample uses the nrfx_gppi helper (see timed_led_toggle.c) but does
not enable it in its configuration. For nRF52 and nRF53, this module is
enabled by the UART driver, but this is not the case for nRF54H.
Enable the module explicitly to avoid such discrepancies.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This option was deprecated and has been finally removed.
See Zephyr PR 82722.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Since the dependencies of `BT_ISO_CENTRAL/PERIPHERAL` options have
changed and they no longer select `BT_CENTRAL/PERIPHERAL` options
but rather depend on them, the latter must be explicitly enabled.

Also enable the nrfx_gppi helper explicitly as the sample uses it
(see controller_time_*.c). For nRF54H it will not be enabled by
the UART driver like it happens for nRF52 and nRF53.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
The BUILD_ONLY flag name has been unified in upstream zephyr.
Update the flags in downstream accordingly.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
@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 28, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 28, 2025

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

Name Old Revision New Revision Diff
dragoon d85f37138db71ea6376260fb3ed5819faa4b97ee 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
mcuboot nrfconnect/sdk-mcuboot@99d4ae9 nrfconnect/sdk-mcuboot#393 nrfconnect/sdk-mcuboot#393/files
nrfxlib nrfconnect/sdk-nrfxlib@b5c1a84 (main) nrfconnect/sdk-nrfxlib#1640 nrfconnect/sdk-nrfxlib#1640/files
sidewalk nrfconnect/sdk-sidewalk@f274ce8 nrfconnect/sdk-sidewalk#673 nrfconnect/sdk-sidewalk#673/files
suit-processor nrfconnect/suit-processor@a499bca nrfconnect/suit-processor@a1a9ef7 (main) nrfconnect/suit-processor@a499bcad..a1a9ef77
zephyr nrfconnect/sdk-zephyr@1aa2f9d (main) 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

NordicBuilder commented Jan 28, 2025

CI Information

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

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

frkv added 3 commits January 28, 2025 09:44
-Adding PSA_WANT_ALG_CMAC to ensure we can have support for
 PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-Previously there may have been a CONFIG_HOSTAP_CRYPTO_LEGACY_PSA config
 but this is causing build-failures. This commit updates
 shell-sample to use CONFIG_HOSTAP_CRYPTO_ALT_LEGACY_PSA as extra_args

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-Adds des-internal.c if CONFIG_HOSTAP_CRYPTO_ENTERPRISE is set

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
@frkv frkv force-pushed the wifi_kconfig_fixes branch from 2eb2578 to d585b4a Compare January 28, 2025 09:56
-Setting the Mbed TLS named configuration for server name indication
 MBEDTLS_SSL_SERVER_NAME_INDICATION for WIFI enterprise.

-Note that Zephyr has a misnamed configuration
 MBEDTLS_SERVER_NAME_INDICATION (missing infix label SSL_)

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
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-mcuboot manifest-nrfxlib manifest-sidewalk manifest-suit-processor manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.