Skip to content

Commit

Permalink
Merge branch 'feature/support_app_rollback' into 'master'
Browse files Browse the repository at this point in the history 
feat(ESPAT-2100): Enabled app rollback support

See merge request application/esp-at!1640
  • Loading branch information
@xcguang
xcguang committed Oct 24, 2024
2 parents e28eaf0 + a716499 commit dbceb52
Show file tree
Hide file tree
Showing 26 changed files with 52 additions and 0 deletions.
2 changes: 2 additions & 0 deletions module_config/module_esp32-d2wd/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32-d2wd/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32-sdio/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32-sdio/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2-2mb/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
CONFIG_BOOTLOADER_COMPRESSED_ENABLED=y
CONFIG_ENABLE_LEGACY_ESP_BOOTLOADER_PLUS_V2_SUPPORT=y

Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2-2mb/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
CONFIG_BOOTLOADER_COMPRESSED_ENABLED=y
CONFIG_ENABLE_LEGACY_ESP_BOOTLOADER_PLUS_V2_SUPPORT=y

Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2-ble-2mb/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2-ble-2mb/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c2_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3-spi/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3-spi/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3_rainmaker/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_WDT_TIME_MS=20000
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
CONFIG_BOOTLOADER_COMPRESSED_ENABLED=y
CONFIG_ENABLE_LEGACY_ESP_BOOTLOADER_PLUS_V2_SUPPORT=y

Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c3_rainmaker/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_WDT_TIME_MS=20000
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
CONFIG_BOOTLOADER_COMPRESSED_ENABLED=y
CONFIG_ENABLE_LEGACY_ESP_BOOTLOADER_PLUS_V2_SUPPORT=y

Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c5_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c5_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c6_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32c6_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32s2_default/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_esp32s2_default/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_wrover-32/sdkconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
2 changes: 2 additions & 0 deletions module_config/module_wrover-32/sdkconfig_silence.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

# Bootloader config
CONFIG_BOOTLOADER_WDT_ENABLE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down

0 comments on commit dbceb52

Please sign in to comment.