From a716499424ab5a1ab8608b502b416a89a34a0089 Mon Sep 17 00:00:00 2001 From: Chen Wu Date: Wed, 23 Oct 2024 16:22:02 +0800 Subject: [PATCH] feat(ESPAT-2100): Enabled app rollback support --- module_config/module_esp32-d2wd/sdkconfig.defaults | 2 ++ module_config/module_esp32-d2wd/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32-sdio/sdkconfig.defaults | 2 ++ module_config/module_esp32-sdio/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32_default/sdkconfig.defaults | 2 ++ module_config/module_esp32_default/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c2-2mb/sdkconfig.defaults | 2 ++ module_config/module_esp32c2-2mb/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c2-ble-2mb/sdkconfig.defaults | 2 ++ module_config/module_esp32c2-ble-2mb/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c2_default/sdkconfig.defaults | 2 ++ module_config/module_esp32c2_default/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c3-spi/sdkconfig.defaults | 2 ++ module_config/module_esp32c3-spi/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c3_default/sdkconfig.defaults | 2 ++ module_config/module_esp32c3_default/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c3_rainmaker/sdkconfig.defaults | 2 ++ .../module_esp32c3_rainmaker/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c5_default/sdkconfig.defaults | 2 ++ module_config/module_esp32c5_default/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32c6_default/sdkconfig.defaults | 2 ++ module_config/module_esp32c6_default/sdkconfig_silence.defaults | 2 ++ module_config/module_esp32s2_default/sdkconfig.defaults | 2 ++ module_config/module_esp32s2_default/sdkconfig_silence.defaults | 2 ++ module_config/module_wrover-32/sdkconfig.defaults | 2 ++ module_config/module_wrover-32/sdkconfig_silence.defaults | 2 ++ 26 files changed, 52 insertions(+) diff --git a/module_config/module_esp32-d2wd/sdkconfig.defaults b/module_config/module_esp32-d2wd/sdkconfig.defaults index 0527aa37..10e18c95 100644 --- 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 index 5b370cf7..14b6e569 100644 --- 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 index a336dda2..1d898f25 100644 --- 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 index 5063d779..162ba630 100644 --- 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 index 48c3fe28..f7dd03a1 100644 --- 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 index 0552e666..9dc48b2c 100644 --- 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 index 9c8607cb..27419c44 100644 --- 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 index 83345900..5129dda5 100644 --- 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 index aa6caad4..e59fd210 100644 --- 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 index e590538b..e41e3a37 100644 --- 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 index 6613b3ac..3128446d 100644 --- 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 index 3177f0b7..a765c6f0 100644 --- 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 index 09453bf9..86e6b073 100644 --- 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 index 5f61c0c6..70af414b 100644 --- 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 index 397a7125..eaddcdd7 100644 --- 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 index fc7e0c79..7118c35a 100644 --- 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 index 5cd1516a..f7b71b7c 100644 --- 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 index 4370b378..c36a327c 100644 --- 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 index 8c670193..53cdeb78 100644 --- 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 index 16e2be98..dda2b70c 100644 --- 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 index 5e390af7..b1654397 100644 --- 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 index fb49f584..e05bb9d7 100644 --- 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 index ab6d38f3..bf77868d 100644 --- 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 index 1d6274b5..945d338e 100644 --- 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 index b6217de2..e924623f 100644 --- 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 index 3f57716e..b5b30667 100644 --- 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