Skip to content

espressif: mcuboot: get MCUBOOT_BOOT_MAX_ALIGN value from DT #445

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

Open
wants to merge 1 commit into
base: zephyr
Choose a base branch
from
Open

espressif: mcuboot: get MCUBOOT_BOOT_MAX_ALIGN value from DT #445

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
11 changes: 9 additions & 2 deletions zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#ifndef __MCUBOOT_CONFIG_H__
#define __MCUBOOT_CONFIG_H__

#include <zephyr/devicetree.h>
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe putting this include under the ifdef CONFIG_SECURE_FLASH_ENC_ENABLED ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file is used only from Zephyr application or Zephyr port builds, so this include should not be a problem.
Also there is no CONFIG_SECURE_FLASH_ENC_ENABLED config on Zephyr application side, the flash encryption enabled/disabled checking is done on runtime. The write-block size must match the flash encryption requirement prior to the build though.


/*
* Signature types
*
Expand All @@ -29,8 +31,13 @@
#define MCUBOOT_SIGN_ED25519
#endif

#if defined(CONFIG_SECURE_FLASH_ENC_ENABLED)
#define MCUBOOT_BOOT_MAX_ALIGN 32
/* This mcuboot_config.h is used only by Zephyr builds, such as MCUboot
* Zephyr Port for ESP chips or a Zephyr application with MCUboot
* compatibilty (that builds the bootutil lib).
* In these cases, MCUBOOT_BOOT_MAX_ALIGN value must be taken from DT if
* the write-block-size is greater than 8 */
#if DT_PROP(DT_CHOSEN(zephyr_flash), write_block_size) > 8
#define MCUBOOT_BOOT_MAX_ALIGN DT_PROP(DT_CHOSEN(zephyr_flash), write_block_size)
#endif

/*
Expand Down