Skip to content

Fix rom offset on 54L with TF-m#4042

Merged
nordicjm merged 3 commits into
nrfconnect:mainfrom
degjorva:54l-fix-offset-cherry-pick
May 13, 2026
Merged

Fix rom offset on 54L with TF-m#4042
nordicjm merged 3 commits into
nrfconnect:mainfrom
degjorva:54l-fix-offset-cherry-pick

Conversation

@degjorva
Copy link
Copy Markdown
Contributor

@degjorva degjorva commented May 5, 2026

Fix issue after PM removal where 54L would have an empty space

@degjorva degjorva force-pushed the 54l-fix-offset-cherry-pick branch from 41beef5 to 040d979 Compare May 13, 2026 08:47
degjorva and others added 3 commits May 13, 2026 10:47
…ide"

This reverts commit bc38fb0.

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
When TF-m is enabled on 54L the ROM_START_OFFSET should
not be overridden, even if MCUboot is enabled.

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit 46d1934)
Adds an override to force this Kconfig to 0 when partition manager
is enabled

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit cf7c4d3)
@degjorva degjorva force-pushed the 54l-fix-offset-cherry-pick branch from 040d979 to 26310d5 Compare May 13, 2026 08:47
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 13, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#4042

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 13, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#4042

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Copy link
Copy Markdown
Contributor

@frkv frkv left a comment

Choose a reason for hiding this comment

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

LGTM

@nordicjm nordicjm merged commit 97eb343 into nrfconnect:main May 13, 2026
11 checks passed
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 13, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#4042

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
rlubos pushed a commit to nrfconnect/sdk-nrf that referenced this pull request May 13, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#4042

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants