Enable APP_ROLLBACK_ENABLE

Author: me-no-dev

cores/esp32/esp32-hal-misc.c

@@ -21,6 +21,9 @@
 #include "esp_partition.h"
 #include "esp_log.h"
 #include "esp_timer.h"
+#ifdef CONFIG_APP_ROLLBACK_ENABLE
+#include "esp_ota_ops.h"
+#endif //CONFIG_APP_ROLLBACK_ENABLE
 #ifdef CONFIG_BT_ENABLED
 #include "esp_bt.h"
 #endif //CONFIG_BT_ENABLED
@@ -145,6 +148,9 @@ void initVariant() {}
 void init() __attribute__((weak));
 void init() {}
 
+bool verifyOta() __attribute__((weak));
+bool verifyOta() { return true; }
+
 #ifdef CONFIG_BT_ENABLED
 //overwritten in esp32-hal-bt.c
 bool btInUse() __attribute__((weak));
@@ -153,6 +159,20 @@ bool btInUse(){ return false; }
 
 void initArduino()
 {
+#ifdef CONFIG_APP_ROLLBACK_ENABLE
+    const esp_partition_t *running = esp_ota_get_running_partition();
+    esp_ota_img_states_t ota_state;
+    if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
+        if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
+            if (verifyOta()) {
+                esp_ota_mark_app_valid_cancel_rollback();
+            } else {
+                log_e("OTA verification failed! Start rollback to the previous version ...");
+                esp_ota_mark_app_invalid_rollback_and_reboot();
+            }
+        }
+    }
+#endif
     //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
     //ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
 #ifdef F_CPU

tools/sdk/bin/bootloader_dio_40m.bin

@@ -26,15 +26,14 @@
 #define CONFIG_IPC_TASK_STACK_SIZE 1024
 #define CONFIG_FATFS_PER_FILE_CACHE 1
 #define CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY 1
-#define CONFIG_ESPTOOLPY_FLASHFREQ "80m"
+#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_UDP_RECVMBOX_SIZE 6
 #define CONFIG_ARDUHAL_PARTITION_SCHEME_DEFAULT 1
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
 #define CONFIG_A2DP_SINK_TASK_STACK_SIZE 2048
-#define CONFIG_SPIRAM_OCCUPY_HSPI_HOST 1
 #define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "4MB"
@@ -52,6 +51,7 @@
 #define CONFIG_BT_STACK_NO_LOG 1
 #define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_MBEDTLS_ECDSA_C 1
+#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
 #define CONFIG_HTTPD_MAX_REQ_HDR_LEN 512
 #define CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE 0
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
@@ -76,6 +76,7 @@
 #define CONFIG_CONSOLE_UART_BAUDRATE 115200
 #define CONFIG_SPIRAM_SUPPORT 1
 #define CONFIG_LWIP_MAX_SOCKETS 10
+#define CONFIG_APP_ROLLBACK_ENABLE 1
 #define CONFIG_LWIP_NETIF_LOOPBACK 1
 #define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
 #define CONFIG_EMAC_TASK_PRIORITY 20
@@ -198,17 +199,16 @@
 #define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN 0
 #define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
 #define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN 2
-#define CONFIG_SPIRAM_SPEED_80M 1
 #define CONFIG_PICO_PSRAM_CS_IO 10
 #define CONFIG_EMAC_TASK_STACK_SIZE 3072
 #define CONFIG_MB_QUEUE_LENGTH 20
 #define CONFIG_SW_COEXIST_PREFERENCE_VALUE 0
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
 #define CONFIG_OV2640_SUPPORT 1
 #define CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER 1
-#define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK 1
 #define CONFIG_PPP_SUPPORT 1
+#define CONFIG_SPIRAM_SPEED_40M 1
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 2048
 #define CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V 1
 #define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 2000

tools/sdk/bin/bootloader_dio_80m.bin

@@ -56,13 +56,14 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
 CONFIG_LOG_BOOTLOADER_LEVEL=0
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
 CONFIG_BOOTLOADER_WDT_ENABLE=y
 CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
-CONFIG_APP_ROLLBACK_ENABLE=
+CONFIG_APP_ROLLBACK_ENABLE=y
 
 #
 # Security features
@@ -88,11 +89,11 @@ CONFIG_FLASHMODE_QOUT=
 CONFIG_FLASHMODE_DIO=y
 CONFIG_FLASHMODE_DOUT=
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_FLASHFREQ_40M=
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_ESPTOOLPY_FLASHFREQ_26M=
 CONFIG_ESPTOOLPY_FLASHFREQ_20M=
-CONFIG_ESPTOOLPY_FLASHFREQ="80m"
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 CONFIG_ESPTOOLPY_FLASHSIZE_1MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
@@ -267,15 +268,12 @@ CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=
 CONFIG_SPIRAM_SIZE=-1
-CONFIG_SPIRAM_SPEED_40M=
-CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
-CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
-CONFIG_SPIRAM_OCCUPY_VSPI_HOST=
 CONFIG_PICO_PSRAM_CS_IO=10
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=