Skip to content

[nrf noup] modules: mbedtls: revert removal of deprecated options#16

Merged
anangl merged 2 commits into
anangl:meta-upmergefrom
tomi-font:upmerge_20260325_mbedtls_3_6_kconfig_options
Apr 13, 2026
Merged

[nrf noup] modules: mbedtls: revert removal of deprecated options#16
anangl merged 2 commits into
anangl:meta-upmergefrom
tomi-font:upmerge_20260325_mbedtls_3_6_kconfig_options

Conversation

@tomi-font
Copy link
Copy Markdown

No description provided.

tomi-font and others added 2 commits April 13, 2026 15:51
This is a revert of 51325c4
with conflicts solved by hand (to avoid having to revert too many
commits) and with the extra change that config-mbedtls.h includes
config-tf-psa-crypto.h so that it contains the full Mbed TLS
configuration as it used to.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
…en built-in in PSA"

This reverts commit ac6d834.

Temporarily revert an upstream change that leads to a Kconfig dependency
loop with MBEDTLS_CIPHER_AES_ENABLED. This is supposed to be replaced
with a better fix later.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit b1e5e0e)
@tomi-font tomi-font force-pushed the upmerge_20260325_mbedtls_3_6_kconfig_options branch from 52d96b1 to 01c5e4a Compare April 13, 2026 12:51
@tomi-font tomi-font changed the title [nrf noup] revert removal of deprecated Mbed TLS config options [nrf noup] modules: mbedtls: revert removal of deprecated options Apr 13, 2026
@anangl anangl merged commit 8e1288a into anangl:meta-upmerge Apr 13, 2026
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants