Byte Alignment to support STM32U5 #1955
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Provide user to define the BOOT_MAX_ALIGN based on system requirement Signed-off-by: Chanakya Macharla <[email protected]>
Added BOOT_MAX_ALIGN == 16 condition for boot_img_magic in boot/bootutil/src/bootutil_public.c, because STM32U5 supports 16 Byte alignment. Signed-off-by: Chanakya Macharla <[email protected]>
de-nordic
reviewed
Jun 5, 2024
| @@ -93,7 +93,11 @@ _Static_assert(MCUBOOT_BOOT_MAX_ALIGN >= 8 && MCUBOOT_BOOT_MAX_ALIGN <= 32, | |||
| #define BOOT_MAX_ALIGN MCUBOOT_BOOT_MAX_ALIGN | |||
| #define BOOT_MAGIC_ALIGN_SIZE ALIGN_UP(BOOT_MAGIC_SZ, BOOT_MAX_ALIGN) | |||
| #else | |||
|
|
|||
| #if !defined( BOOT_MAX_ALIGN ) | |||
There was a problem hiding this comment.
Unneeded spaces within ().
davidvincze
requested changes
Jun 5, 2024
Comment on lines
+97
to
+99
| #if !defined( BOOT_MAX_ALIGN ) | ||
| #define BOOT_MAX_ALIGN 8 | ||
| #endif |
There was a problem hiding this comment.
BOOT_MAX_ALIGN is always defined, it's used internally.
Please use the MCUBOOT_BOOT_MAX_ALIGN as public config interface, its value will be assigned to BOOT_MAX_ALIGN in line 93.
| @@ -57,7 +57,7 @@ BOOT_LOG_MODULE_DECLARE(mcuboot); | |||
| BOOT_LOG_MODULE_REGISTER(mcuboot_util); | |||
| #endif | |||
|
|
|||
| #if BOOT_MAX_ALIGN == 8 | |||
| #if (BOOT_MAX_ALIGN == 8) || (BOOT_MAX_ALIGN == 16) | |||
There was a problem hiding this comment.
Please check the design doc's trailer section (https://github.com/mcu-tools/mcuboot/blob/main/docs/design.md#image-trailer) at point 7.
IMHO this modification is not needed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modified #if BOOT_MAX_ALIGN == 8 to #if (BOOT_MAX_ALIGN == 8) || (BOOT_MAX_ALIGN == 16) for boot_img_magic in boot/bootutil/src/bootutil_public.c, because STM32U5 supports 16 Byte alignment.
Provided #if !defined( BOOT_MAX_ALIGN ) preprocessor directive for #define BOOT_MAX_ALIGN 8 in boot/bootutil/include/bootutil/bootutil_public.h, because STM32U5 supports 16 Byte alignment which can be provided with preprocessor options as #define BOOT_MAX_ALIGN 16.
Signed-off-by: Chanakya Macharla [email protected]