Skip to content

upmerge 2026.03.25#624

Merged
anangl merged 5 commits intonrfconnect:mainfrom
nordicjm:bringinnewmappedbinding
Apr 30, 2026
Merged

upmerge 2026.03.25#624
anangl merged 5 commits intonrfconnect:mainfrom
nordicjm:bringinnewmappedbinding

Conversation

@nordicjm
Copy link
Copy Markdown
Contributor

@nordicjm nordicjm commented Mar 18, 2026

manifest-pr-skip

@nordicjm nordicjm requested a review from a team as a code owner March 18, 2026 10:59
@nordicjm nordicjm force-pushed the bringinnewmappedbinding branch 2 times, most recently from a7de5b4 to f2276ed Compare March 18, 2026 14:11
@nvlsianpu nvlsianpu requested a review from tomchy March 19, 2026 17:02
#error "mcuboot resume support section not defined in dts"
#endif

#define FIXED_PARTITION_ADDR(node_label) DT_REG_ADDR(DT_NODELABEL(node_label))
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.

@tomchy You suggested that for some purpose. Is this removal/replacement OK?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If you look here: nrfconnect/sdk-zephyr#3880
The devicetree.h file now includes the <zephyr/devicetree/mapped-partition.h> which is the newly introduced mechanism to get partition address/offset/size, without the need to enable FLASH_MAP in the build.
Additionally, the PR sets all partitions on all Nordic platform to use the new compatible (zephyr,mapped-partition).

We still may need to give it a thought if those changes are backward compatible (imagine an out of tree sample that still uses fixed-partitions and fixed-subpartitions). The code there should handle it fine, but since all platforms are migrated, there are no tests that verify the old syntax.

@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 2, 2026

Rebased.

@anangl anangl force-pushed the bringinnewmappedbinding branch from ffa6dbb to 1f2c7ba Compare April 8, 2026 09:46
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 8, 2026

rebased

@anangl anangl force-pushed the bringinnewmappedbinding branch from 1f2c7ba to 2cbd4a9 Compare April 9, 2026 13:11
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 9, 2026

rebased

@tomi-font tomi-font changed the title [nrf noup] boot: zephyr: Update partition macros upmerge 2026.03.25 Apr 13, 2026
@anangl anangl force-pushed the bringinnewmappedbinding branch from 9ed09f5 to 1d349db Compare April 14, 2026 09:53
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 14, 2026

rebased

@tomi-font tomi-font force-pushed the bringinnewmappedbinding branch from ba4ac98 to 1657c10 Compare April 17, 2026 08:40
@anangl anangl force-pushed the bringinnewmappedbinding branch from 1657c10 to feaf7f8 Compare April 17, 2026 15:17
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 17, 2026

rebased

@anangl anangl force-pushed the bringinnewmappedbinding branch 2 times, most recently from e191794 to cae3c5a Compare April 28, 2026 09:35
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 28, 2026

rebased

nordicjm and others added 5 commits April 29, 2026 13:30
Updates partition macros to use the new, non-deprecated macros

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
To MBEDTLS_MD_C. Kconfig option was renamed in Zephyr.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
…_RSA

It used to be enabled by default, but the default enabling has been
removed.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
The Kconfig option was renamed in Zephyr and NCS.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
nrf-squash! [nrf noup] boot/zephyr: improve S2RAM resume support using dedicated API

so that the `TEXT` argument in `SECTION_FUNC(TEXT, ...)` gets replaced
with `text` and the resulting section name matches the `.text.*` pattern
in the linker script (`.TEXT.*` is no longer there).

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
@anangl anangl force-pushed the bringinnewmappedbinding branch from cae3c5a to dfda283 Compare April 29, 2026 11:30
@anangl
Copy link
Copy Markdown
Contributor

anangl commented Apr 29, 2026

rebased

@sonarqubecloud
Copy link
Copy Markdown

@anangl anangl merged commit 8230615 into nrfconnect:main Apr 30, 2026
3 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.

6 participants