Skip to content

upmerge 2026.03.25 - #714

Merged
anangl merged 3 commits into
nrfconnect:masterfrom
tomi-font:upmerge_2026.03.25
Apr 30, 2026
Merged

anangl merged 3 commits into
nrfconnect:masterfrom
tomi-font:upmerge_2026.03.25

Conversation

@tomi-font

@tomi-font tomi-font commented Apr 13, 2026 •

Copy link
Copy Markdown
Contributor

manifest-pr-skip

Testing

NCS PR: nrfconnect/sdk-nrf#27726

@anangl

anangl commented Apr 14, 2026

Copy link
Copy Markdown

rebased

tomi-font and others added 3 commits April 27, 2026 12:17
To CONFIG_MBEDTLS_CONFIG_FILE. Change comes from Zephyr.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
The obsolete nosys.spec is no more needed with the new Zephyr
version.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Normalize Zephyr compile flags before exporting them to Matter GN
args by rewriting `$<TARGET_PROPERTY:LTO>` to
`$<TARGET_PROPERTY:zephyr_interface,LTO>`.
This avoids CMake generate-time failures in `file(GENERATE)`
after recent Zephyr LTO/KERNEL_NO_LTO changes.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@anangl
anangl force-pushed the upmerge_2026.03.25 branch from df1cfed to 40ed3ab Compare April 27, 2026 10:18
@anangl

anangl commented Apr 27, 2026

Copy link
Copy Markdown

rebased

@LuDuda LuDuda left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@anangl
anangl merged commit d7be4e6 into nrfconnect:master Apr 30, 2026
26 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants