Merge branch 'feature/add_option_allow_short_app_partition' into 'master'

bootloader: Allows app partition length not 64KB aligned for NO SECURE BOOT

Closes IDF-4984

See merge request espressif/esp-idf!18364
This commit is contained in:
Mahavir Jain
2022-06-06 12:21:12 +08:00

View File

@@ -825,7 +825,7 @@ menu "Security features"
endchoice endchoice
menu "Potentially insecure options" menu "Potentially insecure options"
visible if SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT || SECURE_BOOT_INSECURE visible if SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT || SECURE_BOOT_INSECURE || SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT # NOERROR
# NOTE: Options in this menu NEED to have SECURE_BOOT_INSECURE # NOTE: Options in this menu NEED to have SECURE_BOOT_INSECURE
# and/or SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT in "depends on", as the menu # and/or SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT in "depends on", as the menu
@@ -862,7 +862,7 @@ menu "Security features"
config SECURE_BOOT_ALLOW_SHORT_APP_PARTITION config SECURE_BOOT_ALLOW_SHORT_APP_PARTITION
bool "Allow app partition length not 64KB aligned" bool "Allow app partition length not 64KB aligned"
depends on SECURE_BOOT_INSECURE depends on SECURE_BOOT_INSECURE || SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT
help help
If not set (default), app partition size must be a multiple of 64KB. App images are padded to 64KB If not set (default), app partition size must be a multiple of 64KB. App images are padded to 64KB
length, and the bootloader checks any trailing bytes after the signature (before the next 64KB length, and the bootloader checks any trailing bytes after the signature (before the next 64KB