Skip to content

[nrf noup] Make fprotect area span only MCUBoot #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
Merged

[nrf noup] Make fprotect area span only MCUBoot #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion boot/zephyr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,13 +903,24 @@ int main(void)

#if USE_PARTITION_MANAGER && CONFIG_FPROTECT

/* Round up to next CONFIG_FPROTECT_BLOCK_SIZE boundary.
* This is used for backwards compatibility, as some applications
* use MCUBoot size unaligned to CONFIG_FPROTECT_BLOCK_SIZE.
* However, even in these cases, the start of the next area
* was still aligned to CONFIG_FPROTECT_BLOCK_SIZE and the
* remaining space was filled by an EMPTY section by partition manager.
*/
#define FPROTECT_ALIGN_UP(x) \
((((x) + CONFIG_FPROTECT_BLOCK_SIZE - 1) / CONFIG_FPROTECT_BLOCK_SIZE) * \
CONFIG_FPROTECT_BLOCK_SIZE)

#ifdef PM_S1_ADDRESS
/* MCUBoot is stored in either S0 or S1, protect both */
#define PROTECT_SIZE (PM_MCUBOOT_PRIMARY_ADDRESS - PM_S0_ADDRESS)
#define PROTECT_ADDR PM_S0_ADDRESS
#else
/* There is only one instance of MCUBoot */
#define PROTECT_SIZE (PM_MCUBOOT_PRIMARY_ADDRESS - PM_MCUBOOT_ADDRESS)
#define PROTECT_SIZE FPROTECT_ALIGN_UP(PM_MCUBOOT_SIZE)
#define PROTECT_ADDR PM_MCUBOOT_ADDRESS
#endif

Expand Down