Skip to content

boot: zephyr: cmake: Add mbedTLS library folder to include path, and fix boot serial issues#2630

Merged
de-nordic merged 2 commits intomcu-tools:mainfrom
nordicjm:somefixes
Feb 13, 2026
Merged

boot: zephyr: cmake: Add mbedTLS library folder to include path, and fix boot serial issues#2630
de-nordic merged 2 commits intomcu-tools:mainfrom
nordicjm:somefixes

Conversation

@nordicjm
Copy link
Copy Markdown
Collaborator

@nordicjm nordicjm commented Feb 13, 2026

RSA support with encryption stopped working with the recent fix to
properly use CMake, previously this was working only by pure chance
that MCUboot was created using the zephyr_library_* functions
without defining an actual library, whilst mbedTLS was doing the
same - meaning that the MCUboot build and mbedTLS library actually
shared things like include paths even though MCUboot did not
correctly add them, which masked an issue that a required include
path was missing

also

boot_serial: boot_serial_encryption: Fix typos and wrong types

Fixes some issues with this where a wrong type was used, and wrong
indirections of pointers have been used

Fixes #2629

@nordicjm nordicjm requested a review from de-nordic as a code owner February 13, 2026 08:05
@nordicjm nordicjm added area: zephyr Affects the Zephyr port area: serial recovery Hotfix Somebody has messed up labels Feb 13, 2026
RSA support with encryption stopped working with the recent fix to
properly use CMake, previously this was working only by pure chance
that MCUboot was created using the zephyr_library_* functions
without defining an actual library, whilst mbedTLS was doing the
same - meaning that the MCUboot build and mbedTLS library actually
shared things like include paths even though MCUboot did not
correctly add them, which masked an issue that a required include
path was missing

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Fixes some issues with this where a wrong type was used, and wrong
indirections of pointers have been used

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm changed the title boot: zephyr: cmake: Add mbedTLS library folder to include path, and revert boot serial commit boot: zephyr: cmake: Add mbedTLS library folder to include path, and fix boot serial issues Feb 13, 2026
@de-nordic de-nordic merged commit 117b00e into mcu-tools:main Feb 13, 2026
65 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: serial recovery area: zephyr Affects the Zephyr port Hotfix Somebody has messed up

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Encrypted image build issue with PSA and serial recovery

2 participants