Merge branch 'feature/support_app_rollback' into 'master'

xcguang · xcguang · commit dbceb52f5da2 · 2024-10-24T16:17:17.000+08:00
feat(ESPAT-2100): Enabled app rollback support

See merge request application/esp-at!1640
diff --git a/module_config/module_esp32-d2wd/sdkconfig.defaults b/module_config/module_esp32-d2wd/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32-d2wd/sdkconfig_silence.defaults b/module_config/module_esp32-d2wd/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32-sdio/sdkconfig.defaults b/module_config/module_esp32-sdio/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32-sdio/sdkconfig_silence.defaults b/module_config/module_esp32-sdio/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32_default/sdkconfig.defaults b/module_config/module_esp32_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32_default/sdkconfig_silence.defaults b/module_config/module_esp32_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c2-2mb/sdkconfig.defaults b/module_config/module_esp32c2-2mb/sdkconfig.defaults
@@ -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
 
diff --git a/module_config/module_esp32c2-2mb/sdkconfig_silence.defaults b/module_config/module_esp32c2-2mb/sdkconfig_silence.defaults
@@ -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
 
diff --git a/module_config/module_esp32c2-ble-2mb/sdkconfig.defaults b/module_config/module_esp32c2-ble-2mb/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c2-ble-2mb/sdkconfig_silence.defaults b/module_config/module_esp32c2-ble-2mb/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c2_default/sdkconfig.defaults b/module_config/module_esp32c2_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c2_default/sdkconfig_silence.defaults b/module_config/module_esp32c2_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c3-spi/sdkconfig.defaults b/module_config/module_esp32c3-spi/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c3-spi/sdkconfig_silence.defaults b/module_config/module_esp32c3-spi/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c3_default/sdkconfig.defaults b/module_config/module_esp32c3_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c3_default/sdkconfig_silence.defaults b/module_config/module_esp32c3_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c3_rainmaker/sdkconfig.defaults b/module_config/module_esp32c3_rainmaker/sdkconfig.defaults
@@ -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
 
diff --git a/module_config/module_esp32c3_rainmaker/sdkconfig_silence.defaults b/module_config/module_esp32c3_rainmaker/sdkconfig_silence.defaults
@@ -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
 
diff --git a/module_config/module_esp32c5_default/sdkconfig.defaults b/module_config/module_esp32c5_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c5_default/sdkconfig_silence.defaults b/module_config/module_esp32c5_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32c6_default/sdkconfig.defaults b/module_config/module_esp32c6_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32c6_default/sdkconfig_silence.defaults b/module_config/module_esp32c6_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_esp32s2_default/sdkconfig.defaults b/module_config/module_esp32s2_default/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_esp32s2_default/sdkconfig_silence.defaults b/module_config/module_esp32s2_default/sdkconfig_silence.defaults
@@ -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
diff --git a/module_config/module_wrover-32/sdkconfig.defaults b/module_config/module_wrover-32/sdkconfig.defaults
@@ -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
diff --git a/module_config/module_wrover-32/sdkconfig_silence.defaults b/module_config/module_wrover-32/sdkconfig_silence.defaults
@@ -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
