Update IDF to 9a26296

Author: me-no-dev

platform.txt

@@ -21,7 +21,7 @@ compiler.warning_flags.all=-Wall -Werror=all -Wextra
 
 compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
+compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/esp_adc_cal" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/spiffs" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
 
 compiler.c.cmd=xtensa-esp32-elf-gcc
 compiler.c.flags=-std=gnu99 -Os -g3 -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c
@@ -33,8 +33,8 @@ compiler.S.cmd=xtensa-esp32-elf-gcc
 compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
-compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
-compiler.c.elf.libs=-lgcc -lstdc++ -lapp_trace -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lcore -lcxx -ldriver -lesp32 -lethernet -lexpat -lfatfs -lfreertos -lhal -lheap -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
+compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
+compiler.c.elf.libs=-lgcc -lstdc++ -lapp_trace -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lconsole -lcore -lcxx -ldriver -lesp32 -lesp_adc_cal -lethernet -lexpat -lfatfs -lfreertos -lhal -lheap -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lpthread -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -lspiffs  -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
 
 compiler.as.cmd=xtensa-esp32-elf-as
 

tools/esptool.py

@@ -32,7 +32,7 @@
 import copy
 import io
 
-__version__ = "2.1-beta1"
+__version__ = "2.1"
 
 MAX_UINT32 = 0xffffffff
 MAX_UINT24 = 0xffffff
@@ -1315,7 +1315,7 @@ def __init__(self, load_file=None):
 
  if self.append_digest:
  end = load_file.tell()
- self.stored_digest = load_file.read(16)
+ self.stored_digest = load_file.read(32)
  load_file.seek(start)
  calc_digest = hashlib.sha256()
  calc_digest.update(load_file.read(end - start))
@@ -1864,6 +1864,15 @@ def image_info(args):
  calc_checksum = image.calculate_checksum()
  print('Checksum: %02x (%s)' % (image.checksum,
  'valid' if image.checksum == calc_checksum else 'invalid - calculated %02x' % calc_checksum))
+ try:
+ digest_msg = 'Not appended'
+ if image.append_digest:
+ is_valid = image.stored_digest == image.calc_digest
+ digest_msg = "%s (%s)" % (hexify(image.calc_digest).lower(),
+ "valid" if is_valid else "invalid")
+ print('Validation Hash: %s' % digest_msg)
+ except AttributeError:
+ pass # ESP8266 image has no append_digest field
 
 
 def make_image(args):

tools/platformio-build.py

@@ -57,6 +57,7 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "bt"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "driver"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp32"),
+ join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp_adc_cal"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "ethernet"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "fatfs"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "freertos"),
@@ -72,11 +73,13 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "soc"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "spi_flash"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "sdmmc"),
+ join(FRAMEWORK_DIR, "tools", "sdk", "include", "spiffs"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "tcpip_adapter"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "ulp"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "vfs"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "wear_levelling"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "xtensa-debug-module"),
+ join(FRAMEWORK_DIR, "tools", "sdk", "include", "console"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "newlib"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "coap"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "wpa_supplicant"),
@@ -91,7 +94,7 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "ld")
  ],
  LIBS=[
- "gcc", "stdc++", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "core", "cxx", "driver", "esp32", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
+ "gcc", "stdc++", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "console", "core", "cxx", "driver", "esp32", "esp_adc_cal", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "pthread", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "spiffs", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
  ],
 
  UPLOADERFLAGS=[
@@ -110,6 +113,7 @@
  "-T", "esp32.common.ld",
  "-T", "esp32.rom.ld",
  "-T", "esp32.peripherals.ld",
+ "-T", "esp32.rom.spiram_incompatible_fns.ld",
  "-u", "ld_include_panic_highint_hdl"
  ],
 

tools/sdk/bin/bootloader.bin

@@ -126,13 +126,17 @@ esp_err_t esp_ota_set_boot_partition(const esp_partition_t* partition);
  *
  * If esp_ota_set_boot_partition() has been called, the partition which was set by that function will be returned.
  *
- * If esp_ota_set_boot_partition() has not been called, the result is
- * equivalent to esp_ota_get_running_partition().
+ * If esp_ota_set_boot_partition() has not been called, the result is usually the same as esp_ota_get_running_partition().
+ * The two results are not equal if the configured boot partition does not contain a valid app (meaning that the running partition
+ * will be an app that the bootloader chose via fallback).
+ *
+ * If the OTA data partition is not present or not valid then the result is the first app partition found in the
+ * partition table. In priority order, this means: the factory app, the first OTA app slot, or the test app 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.
+ * returned 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.
+ * @return Pointer to info for partition structure, or NULL if partition table is invalid or a flash read operation failed. Any returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_boot_partition(void);
 

tools/sdk/bin/bootloader_qio.bin

@@ -126,13 +126,17 @@ esp_err_t esp_ota_set_boot_partition(const esp_partition_t* partition);
  *
  * If esp_ota_set_boot_partition() has been called, the partition which was set by that function will be returned.
  *
- * If esp_ota_set_boot_partition() has not been called, the result is
- * equivalent to esp_ota_get_running_partition().
+ * If esp_ota_set_boot_partition() has not been called, the result is usually the same as esp_ota_get_running_partition().
+ * The two results are not equal if the configured boot partition does not contain a valid app (meaning that the running partition
+ * will be an app that the bootloader chose via fallback).
+ *
+ * If the OTA data partition is not present or not valid then the result is the first app partition found in the
+ * partition table. In priority order, this means: the factory app, the first OTA app slot, or the test app 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.
+ * returned 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.
+ * @return Pointer to info for partition structure, or NULL if partition table is invalid or a flash read operation failed. Any returned pointer is valid for the lifetime of the application.
  */
 const esp_partition_t* esp_ota_get_boot_partition(void);
 

tools/sdk/include/app_trace/esp_ota_ops.h

@@ -76,4 +76,6 @@ period_ms_t osi_alarm_get_remaining_ms(const osi_alarm_t *alarm);
 // t1 and t2 should be no greater than the time of MAX ticks
 period_ms_t osi_alarm_time_diff(period_ms_t t1, period_ms_t t2);
 
+uint32_t osi_time_get_os_boottime_ms(void);
+
 #endif /*_ALARM_H_*/

tools/sdk/include/app_update/esp_ota_ops.h

@@ -20,7 +20,7 @@
 #define _ALLOCATOR_H_
 
 #include <stddef.h>
-//#include <stdlib.h>
+#include <stdlib.h>
 #include "sdkconfig.h"
 
 typedef void *(*alloc_fn)(size_t size);
@@ -52,7 +52,7 @@ void osi_mem_dbg_show(void);
 ({ \
  void *p; \
  \
- p = calloc(1, (size)); \
+ p = malloc((size));  \
  osi_mem_dbg_record(p, size, __func__, __LINE__); \
  (void *)p; \
 })
@@ -67,14 +67,15 @@ void osi_mem_dbg_show(void);
 })
 
 #define osi_free(ptr) \
-({ \
- osi_mem_dbg_clean(ptr, __func__, __LINE__); \
- free((ptr)); \
-})
+do { \
+ void *tmp_point = (void *)(ptr); \
+ osi_mem_dbg_clean(tmp_point, __func__, __LINE__); \
+ free(tmp_point); \
+} while (0)
 
 #else
 
-#define osi_malloc(size) calloc(1, (size))
+#define osi_malloc(size) malloc((size))
 #define osi_calloc(size) calloc(1, (size))
 #define osi_free(p) free((p))
 

tools/sdk/include/bluedroid/alarm.h

@@ -24,10 +24,10 @@
 #ifndef AVCT_INT_H
 #define AVCT_INT_H
 
-#include "gki.h"
 #include "avct_api.h"
 #include "avct_defs.h"
 #include "l2c_api.h"
+#include "fixed_queue.h"
 
 /*****************************************************************************
 ** constants
@@ -81,7 +81,7 @@ typedef struct {
  BT_HDR *p_rx_msg; /* Message being reassembled */
  UINT16 conflict_lcid; /* L2CAP channel LCID */
  BD_ADDR peer_addr; /* BD address of peer */
- BUFFER_Q  tx_q; /* Transmit data buffer queue */
+ fixed_queue_t *tx_q; /* Transmit data buffer queue */
  BOOLEAN cong; /* TRUE, if congested */
 } tAVCT_LCB;