Merge branch 'feature/recovery_bootloader_support' into 'master'

feat(bootloader): Support recovery bootloader for ESP32P4

Closes IDF-15653 and IDF-13165

See merge request espressif/esp-idf!48215
This commit is contained in:
Konstantin Kondrashov
2026-05-12 23:24:40 +03:00
27 changed files with 161 additions and 78 deletions
@@ -1627,6 +1627,10 @@ config SOC_PSRAM_ENCRYPTION_PAGE_CONFIGURABLE
bool
default y
config SOC_RECOVERY_BOOTLOADER_SUPPORTED
bool
default y
config SOC_UART_NUM
int
default 6
@@ -617,6 +617,10 @@
#define SOC_PSRAM_ENCRYPTION_SEPARATE_KEY 1 /* PSRAM encryption can use independent key */
#define SOC_PSRAM_ENCRYPTION_PAGE_CONFIGURABLE 1 /* PSRAM encryption can be configured on a MMU page basis */
/*------------------------Bootloader CAPS---------------------------------*/
/* Support Recovery Bootloader */
#define SOC_RECOVERY_BOOTLOADER_SUPPORTED (1)
/*-------------------------- MEMPROT CAPS ------------------------------------*/
/*-------------------------- UART CAPS ---------------------------------------*/
@@ -919,6 +919,14 @@ config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX
int
default 64
config SOC_RECOVERY_BOOTLOADER_SUPPORTED
bool
default y
config SOC_BOOTLOADER_ANTI_ROLLBACK_SUPPORTED
bool
default y
config SOC_UART_NUM
int
default 5
@@ -374,6 +374,12 @@
#define SOC_FLASH_ENCRYPTION_XTS_AES 1
#define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (64)
/*------------------------Bootloader CAPS---------------------------------*/
/* Support Recovery Bootloader */
#define SOC_RECOVERY_BOOTLOADER_SUPPORTED (1)
/* Support Anti-rollback */
#define SOC_BOOTLOADER_ANTI_ROLLBACK_SUPPORTED (1)
/*-------------------------- UART CAPS ---------------------------------------*/
#define SOC_UART_NUM (5)
#define SOC_UART_HP_NUM (4)