Update IDF libs to 969f1bb (skip BT commits)

This update also increases BT stack size and enables reboot on exception

Author: me-no-dev

tools/sdk/bin/bootloader.bin

@@ -129,6 +129,9 @@ esp_err_t esp_ota_set_boot_partition(const esp_partition_t* partition);
  * If esp_ota_set_boot_partition() has not been called, the result is
  * equivalent to esp_ota_get_running_partition().
  *
+ * Note that there is no guarantee the returned partition is a valid app. Use esp_image_load(ESP_IMAGE_VERIFY, ...) to verify if the
+ * partition contains a bootable image.
+ *
  * @return Pointer to info for partition structure, or NULL if no partition is found or flash read operation failed. Returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_boot_partition(void);
@@ -142,6 +145,9 @@ const esp_partition_t* esp_ota_get_boot_partition(void);
  * esp_ota_set_boot_partition(). Only the app whose code is currently
  * running will have its partition information returned.
  *
+ * The partition returned by this function may also differ from esp_ota_get_boot_partition() if the configured boot
+ * partition is somehow invalid, and the bootloader fell back to a different app partition at boot.
+ *
  * @return Pointer to info for partition structure, or NULL if no partition is found or flash read operation failed. Returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_running_partition(void);

tools/sdk/bin/bootloader_qio.bin

@@ -129,6 +129,9 @@ esp_err_t esp_ota_set_boot_partition(const esp_partition_t* partition);
  * If esp_ota_set_boot_partition() has not been called, the result is
  * equivalent to esp_ota_get_running_partition().
  *
+ * Note that there is no guarantee the returned partition is a valid app. Use esp_image_load(ESP_IMAGE_VERIFY, ...) to verify if the
+ * partition contains a bootable image.
+ *
  * @return Pointer to info for partition structure, or NULL if no partition is found or flash read operation failed. Returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_boot_partition(void);
@@ -142,6 +145,9 @@ const esp_partition_t* esp_ota_get_boot_partition(void);
  * esp_ota_set_boot_partition(). Only the app whose code is currently
  * running will have its partition information returned.
  *
+ * The partition returned by this function may also differ from esp_ota_get_boot_partition() if the configured boot
+ * partition is somehow invalid, and the bootloader fell back to a different app partition at boot.
+ *
  * @return Pointer to info for partition structure, or NULL if no partition is found or flash read operation failed. Returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_running_partition(void);

tools/sdk/include/app_trace/esp_ota_ops.h

@@ -21,6 +21,7 @@
 /* Pre-partition table fixed flash offsets */
 #define ESP_BOOTLOADER_DIGEST_OFFSET 0x0
 #define ESP_BOOTLOADER_OFFSET 0x1000 /* Offset of bootloader image. Has matching value in bootloader KConfig.projbuild file. */
+#define ESP_BOOTLOADER_SIZE   (ESP_PARTITION_TABLE_OFFSET - ESP_BOOTLOADER_OFFSET)
 #define ESP_PARTITION_TABLE_OFFSET 0x8000 /* Offset of partition table. Has matching value in partition_table Kconfig.projbuild file. */
 
 #define ESP_PARTITION_TABLE_MAX_LEN 0xC00 /* Maximum length of partition table data */

tools/sdk/include/app_update/esp_ota_ops.h

@@ -142,7 +142,6 @@ esp_err_t esp_image_load(esp_image_load_mode_t mode, const esp_partition_pos_t *
  */
 esp_err_t esp_image_verify_bootloader(uint32_t *length);
 
-
 typedef struct {
     uint32_t drom_addr;
     uint32_t drom_load_addr;

tools/sdk/include/bootloader_support/esp_flash_partitions.h

@@ -15,7 +15,7 @@
 #define CONFIG_SW_COEXIST_ENABLE 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE_4MB 1
 #define CONFIG_IPC_TASK_STACK_SIZE 1024
-#define CONFIG_ESPTOOLPY_FLASHFREQ "80m"
+#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
 #define CONFIG_NEWLIB_STDOUT_ADDCR 1
 #define CONFIG_UDP_RECVMBOX_SIZE 6
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1
@@ -26,9 +26,11 @@
 #define CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL 1
+#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
 #define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10
 #define CONFIG_BT_RESERVE_DRAM 0x10000
+#define CONFIG_ESP32_PANIC_PRINT_REBOOT 1
 #define CONFIG_CONSOLE_UART_BAUDRATE 115200
 #define CONFIG_LWIP_MAX_SOCKETS 10
 #define CONFIG_EMAC_TASK_PRIORITY 20
@@ -38,13 +40,15 @@
 #define CONFIG_ULP_COPROC_RESERVE_MEM 512
 #define CONFIG_ESPTOOLPY_BAUD 921600
 #define CONFIG_INT_WDT_CHECK_CPU1 1
+#define CONFIG_FLASHMODE_DIO 1
 #define CONFIG_ESPTOOLPY_AFTER_RESET 1
 #define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED 1
 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-"
 #define CONFIG_FREERTOS_IDLE_TASK_STACKSIZE 1024
 #define CONFIG_FATFS_LFN_STACK 1
 #define CONFIG_ESP32_WIFI_AMPDU_ENABLED 1
 #define CONFIG_CONSOLE_UART_NUM 0
+#define CONFIG_ESP32_APPTRACE_LOCK_ENABLE 1
 #define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
 #define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
 #define CONFIG_TCP_OVERSIZE_MSS 1
@@ -63,13 +67,12 @@
 #define CONFIG_MAIN_TASK_STACK_SIZE 4096
 #define CONFIG_TASK_WDT_TIMEOUT_S 5
 #define CONFIG_INT_WDT_TIMEOUT_MS 300
-#define CONFIG_ESPTOOLPY_FLASHMODE "dout"
-#define CONFIG_BTC_TASK_STACK_SIZE 2048
+#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
+#define CONFIG_BTC_TASK_STACK_SIZE 8192
 #define CONFIG_BLUEDROID_ENABLED 1
 #define CONFIG_ESPTOOLPY_BEFORE "default_reset"
 #define CONFIG_LOG_DEFAULT_LEVEL 1
 #define CONFIG_TIMER_QUEUE_LENGTH 10
-#define CONFIG_FLASHMODE_DOUT 1
 #define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 0
 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
 #define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
@@ -87,7 +90,6 @@
 #define CONFIG_PARTITION_TABLE_SINGLE_APP 1
 #define CONFIG_ESP32_WIFI_RX_BA_WIN 6
 #define CONFIG_WIFI_ENABLED 1
-#define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 2048
 #define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 2000
 #define CONFIG_BROWNOUT_DET_LVL 0
@@ -113,6 +115,7 @@
 #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
 #define CONFIG_LWIP_SO_REUSE 1
 #define CONFIG_DMA_TX_BUF_NUM 10
+#define CONFIG_WL_SECTOR_SIZE 4096
 #define CONFIG_TIMER_TASK_PRIORITY 1
 #define CONFIG_BT_ENABLED 1
 #define CONFIG_MONITOR_BAUD 115200
@@ -126,6 +129,7 @@
 #define CONFIG_CLASSIC_BT_ENABLED 1
 #define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
+#define CONFIG_WL_SECTOR_SIZE_4096 1
 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
 #define CONFIG_BT_ACL_CONNECTIONS 4
@@ -138,5 +142,4 @@
 #define CONFIG_LWIP_SO_RCVBUF 1
 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
 #define CONFIG_ESPTOOLPY_PORT "/dev/cu.usbserial-DO00EAB0"
-#define CONFIG_ESP32_PANIC_PRINT_HALT 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1

tools/sdk/include/bootloader_support/esp_image_format.h

@@ -219,6 +219,14 @@ typedef enum {
     GPIO_FLOATING,                  /*!< Pad floating           */
 } gpio_pull_mode_t;
 
+typedef enum {
+    GPIO_DRIVE_CAP_0       = 0,    /*!< Pad drive capability: weak          */
+    GPIO_DRIVE_CAP_1       = 1,    /*!< Pad drive capability: stronger      */
+    GPIO_DRIVE_CAP_2       = 2,    /*!< Pad drive capability: default value */
+    GPIO_DRIVE_CAP_DEFAULT = 2,    /*!< Pad drive capability: default value */
+    GPIO_DRIVE_CAP_3       = 3,    /*!< Pad drive capability: strongest     */
+    GPIO_DRIVE_CAP_MAX,
+} gpio_drive_cap_t;
 
 typedef void (*gpio_isr_t)(void*);
 typedef intr_handle_t gpio_isr_handle_t;
@@ -481,6 +489,29 @@ esp_err_t gpio_isr_handler_add(gpio_num_t gpio_num, gpio_isr_t isr_handler, void
   */
 esp_err_t gpio_isr_handler_remove(gpio_num_t gpio_num);
 
+/**
+  * @brief Set GPIO pad drive capability
+  *
+  * @param gpio_num GPIO number, only support output GPIOs
+  * @param strength Drive capability of the pad
+  *
+  * @return
+  *     - ESP_OK Success
+  *     - ESP_ERR_INVALID_ARG Parameter error
+  */
+esp_err_t gpio_set_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t strength);
+
+/**
+  * @brief Get GPIO pad drive capability
+  *
+  * @param gpio_num GPIO number, only support output GPIOs
+  * @param strength Pointer to accept drive capability of the pad
+  *
+  * @return
+  *     - ESP_OK Success
+  *     - ESP_ERR_INVALID_ARG Parameter error
+  */
+esp_err_t gpio_get_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t* strength);
 
 #ifdef __cplusplus
 }

tools/sdk/include/config/sdkconfig.h

@@ -40,6 +40,8 @@ typedef struct {
     uint32_t slpie;     /*!< Mask of input enable in sleep mode */
     uint32_t hold;      /*!< Mask of hold enable */
     uint32_t hold_force;/*!< Mask of hold_force bit for RTC IO in RTC_CNTL_HOLD_FORCE_REG */
+    uint32_t drv_v;     /*!< Mask of drive capability */
+    uint32_t drv_s;     /*!< Offset of drive capability */
     int rtc_num;        /*!< RTC IO number, or -1 if not an RTC GPIO */
 } rtc_gpio_desc_t;
 
@@ -232,6 +234,29 @@ esp_err_t rtc_gpio_hold_dis(gpio_num_t gpio_num);
  */
 void rtc_gpio_force_hold_dis_all();
 
+/**
+  * @brief Set RTC GPIO pad drive capability
+  *
+  * @param gpio_num GPIO number, only support output GPIOs
+  * @param strength Drive capability of the pad
+  *
+  * @return
+  *     - ESP_OK Success
+  *     - ESP_ERR_INVALID_ARG Parameter error
+  */
+esp_err_t rtc_gpio_set_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t strength);
+
+/**
+  * @brief Get RTC GPIO pad drive capability
+  *
+  * @param gpio_num GPIO number, only support output GPIOs
+  * @param strength Pointer to accept drive capability of the pad
+  *
+  * @return
+  *     - ESP_OK Success
+  *     - ESP_ERR_INVALID_ARG Parameter error
+  */
+esp_err_t rtc_gpio_get_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t* strength);
 
 #ifdef __cplusplus
 }

tools/sdk/include/driver/driver/gpio.h

@@ -142,13 +142,17 @@ esp_err_t sdmmc_host_set_card_clk(int slot, uint32_t freq_khz);
  *       can call sdmmc_host_do_transaction as long as other sdmmc_host_*
  *       functions are not called.
  *
+ * @attention Data buffer passed in cmdinfo->data must be in DMA capable memory
+ *
  * @param slot  slot number (SDMMC_HOST_SLOT_0 or SDMMC_HOST_SLOT_1)
  * @param cmdinfo   pointer to structure describing command and data to transfer
  * @return
  *      - ESP_OK on success
  *      - ESP_ERR_TIMEOUT if response or data transfer has timed out
  *      - ESP_ERR_INVALID_CRC if response or data transfer CRC check has failed
  *      - ESP_ERR_INVALID_RESPONSE if the card has sent an invalid response
+ *      - ESP_ERR_INVALID_SIZE if the size of data transfer is not valid in SD protocol
+ *      - ESP_ERR_INVALID_ARG if the data buffer is not in DMA capable memory
  */
 esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo);
 

tools/sdk/include/driver/driver/rtc_io.h

@@ -65,6 +65,7 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_wifi_types.h"
+#include "esp_wifi_crypto_types.h"
 #include "esp_event.h"
 
 #ifdef __cplusplus
@@ -96,6 +97,7 @@ extern "C" {
  */
 typedef struct {
     system_event_handler_t event_handler;          /**< WiFi event handler */
+    wpa_crypto_funcs_t     wpa_crypto_funcs;       /**< WiFi station crypto functions when connect */
     int                    static_rx_buf_num;      /**< WiFi static RX buffer number */
     int                    dynamic_rx_buf_num;     /**< WiFi dynamic RX buffer number */
     int                    tx_buf_type;            /**< WiFi TX buffer type */
@@ -138,11 +140,14 @@ typedef struct {
 #else
 #define WIFI_NANO_FORMAT_ENABLED  0
 #endif
- 
+
+extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
+
 #define WIFI_INIT_CONFIG_MAGIC    0x1F2F3F4F
 #ifdef CONFIG_WIFI_ENABLED
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .event_handler = &esp_event_send, \
+    .wpa_crypto_funcs = g_wifi_default_wpa_crypto_funcs, \
     .static_rx_buf_num = CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM,\
     .dynamic_rx_buf_num = CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM,\
     .tx_buf_type = CONFIG_ESP32_WIFI_TX_BUFFER_TYPE,\