IDF release/v3.2 fcc1516fa

Author: me-no-dev

platform.txt

@@ -35,7 +35,7 @@ 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 -T esp32.rom.libgcc.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  -u __cxa_guard_dummy -u __cxx_fatal_exception
-compiler.c.elf.libs=-lgcc -lesp32 -lphy -lesp_http_client -lmbedtls -lrtc -lesp_http_server -lbtdm_app -lspiffs -lbootloader_support -lmdns -lnvs_flash -lfatfs -lpp -lnet80211 -ljsmn -lface_detection -llibsodium -lvfs -ldl_lib -llog -lfreertos -lcxx -lsmartconfig_ack -lxtensa-debug-module -lheap -ltcpip_adapter -lmqtt -lulp -lfd -lfb_gfx -lnghttp -lprotocomm -lsmartconfig -lm -lethernet -limage_util -lc_nano -lsoc -ltcp_transport -lc -lmicro-ecc -lface_recognition -ljson -lwpa_supplicant -lmesh -lesp_https_ota -lwpa2 -lexpat -llwip -lwear_levelling -lapp_update -ldriver -lbt -lespnow -lcoap -lasio -lnewlib -lconsole -lapp_trace -lesp32-camera -lhal -lprotobuf-c -lsdmmc -lcore -lpthread -lcoexist -lfreemodbus -lspi_flash -lesp-tls -lwpa -lwifi_provisioning -lwps -lesp_adc_cal -lesp_event -lopenssl -lesp_ringbuf -lfr  -lstdc++
+compiler.c.elf.libs=-lgcc -lm -lfatfs -lfreemodbus -lxtensa-debug-module -llog -lheap -lesp32-camera -lesp32 -lexpat -lsoc -lcoap -lwpa_supplicant -lwpa -lconsole -lnvs_flash -lasio -lprotobuf-c -lfd -lsdmmc -lwear_levelling -lmesh -limage_util -lface_recognition -ltcpip_adapter -lcoexist -lspiffs -lwpa2 -lbtdm_app -lc -lprotocomm -lesp_http_client -lopenssl -lethernet -lespnow -lmqtt -ljson -llwip -lesp-tls -lvfs -lrtc -lmicro-ecc -lesp_http_server -lulp -llibsodium -lapp_update -lfreertos -lfb_gfx -lesp_event -lpp -lwps -lsmartconfig -lnet80211 -lod -lfr -lcore -ldl_lib -lphy -lmdns -lsmartconfig_ack -lnghttp -lwifi_provisioning -lmbedtls -lspi_flash -lesp_https_ota -lapp_trace -lnewlib -lface_detection -lpthread -lhal -lcxx -lc_nano -ltcp_transport -lbt -lesp_ringbuf -lbootloader_support -ldriver -ljsmn -lesp_adc_cal  -lstdc++
 
 compiler.as.cmd=xtensa-esp32-elf-as
 

tools/esptool.py

@@ -60,7 +60,7 @@
           "Check the README for installation instructions." % (sys.VERSION, sys.executable))
     raise
 
-__version__ = "2.8-dev"
+__version__ = "2.8"
 
 MAX_UINT32 = 0xffffffff
 MAX_UINT24 = 0xffffff
@@ -1904,7 +1904,8 @@ def split_byte(n):
 
         chip_id = fields[4]
         if chip_id != self.ROM_LOADER.IMAGE_CHIP_ID:
-            print("Unexpected chip id in image. Expected %d but value was %d. Is this image for a different chip model?" % (self.ROM_LOADER.IMAGE_CHIP_ID, chip_id))
+            print(("Unexpected chip id in image. Expected %d but value was %d. " +
+                  "Is this image for a different chip model?") % (self.ROM_LOADER.IMAGE_CHIP_ID, chip_id))
 
         # reserved fields in the middle should all be zero
         if any(f for f in fields[6:-1] if f != 0):
@@ -1916,7 +1917,6 @@ def split_byte(n):
         else:
             raise RuntimeError("Invalid value for append_digest field (0x%02x). Should be 0 or 1.", append_digest)
 
-
     def save_extended_header(self, save_file):
         def join_byte(ln,hn):
             return (ln & 0x0F) + ((hn & 0x0F) << 4)

tools/platformio-build.py

@@ -165,7 +165,7 @@
     ],
 
     LIBS=[
-        "-lgcc", "-lesp32", "-lphy", "-lesp_http_client", "-lmbedtls", "-lrtc", "-lesp_http_server", "-lbtdm_app", "-lspiffs", "-lbootloader_support", "-lmdns", "-lnvs_flash", "-lfatfs", "-lpp", "-lnet80211", "-ljsmn", "-lface_detection", "-llibsodium", "-lvfs", "-ldl_lib", "-llog", "-lfreertos", "-lcxx", "-lsmartconfig_ack", "-lxtensa-debug-module", "-lheap", "-ltcpip_adapter", "-lmqtt", "-lulp", "-lfd", "-lfb_gfx", "-lnghttp", "-lprotocomm", "-lsmartconfig", "-lm", "-lethernet", "-limage_util", "-lc_nano", "-lsoc", "-ltcp_transport", "-lc", "-lmicro-ecc", "-lface_recognition", "-ljson", "-lwpa_supplicant", "-lmesh", "-lesp_https_ota", "-lwpa2", "-lexpat", "-llwip", "-lwear_levelling", "-lapp_update", "-ldriver", "-lbt", "-lespnow", "-lcoap", "-lasio", "-lnewlib", "-lconsole", "-lapp_trace", "-lesp32-camera", "-lhal", "-lprotobuf-c", "-lsdmmc", "-lcore", "-lpthread", "-lcoexist", "-lfreemodbus", "-lspi_flash", "-lesp-tls", "-lwpa", "-lwifi_provisioning", "-lwps", "-lesp_adc_cal", "-lesp_event", "-lopenssl", "-lesp_ringbuf", "-lfr", "-lstdc++"
+        "-lgcc", "-lm", "-lfatfs", "-lfreemodbus", "-lxtensa-debug-module", "-llog", "-lheap", "-lesp32-camera", "-lesp32", "-lexpat", "-lsoc", "-lcoap", "-lwpa_supplicant", "-lwpa", "-lconsole", "-lnvs_flash", "-lasio", "-lprotobuf-c", "-lfd", "-lsdmmc", "-lwear_levelling", "-lmesh", "-limage_util", "-lface_recognition", "-ltcpip_adapter", "-lcoexist", "-lspiffs", "-lwpa2", "-lbtdm_app", "-lc", "-lprotocomm", "-lesp_http_client", "-lopenssl", "-lethernet", "-lespnow", "-lmqtt", "-ljson", "-llwip", "-lesp-tls", "-lvfs", "-lrtc", "-lmicro-ecc", "-lesp_http_server", "-lulp", "-llibsodium", "-lapp_update", "-lfreertos", "-lfb_gfx", "-lesp_event", "-lpp", "-lwps", "-lsmartconfig", "-lnet80211", "-lod", "-lfr", "-lcore", "-ldl_lib", "-lphy", "-lmdns", "-lsmartconfig_ack", "-lnghttp", "-lwifi_provisioning", "-lmbedtls", "-lspi_flash", "-lesp_https_ota", "-lapp_trace", "-lnewlib", "-lface_detection", "-lpthread", "-lhal", "-lcxx", "-lc_nano", "-ltcp_transport", "-lbt", "-lesp_ringbuf", "-lbootloader_support", "-ldriver", "-ljsmn", "-lesp_adc_cal", "-lstdc++"
     ],
 
     LIBSOURCE_DIRS=[

tools/sdk/bin/bootloader_dio_40m.bin

@@ -23,6 +23,11 @@ typedef enum {
     GPIO_NOT_HOLD   = 0     /*!< If the GPIO input is not low */
 } esp_comm_gpio_hold_t;
 
+typedef enum {
+    ESP_IMAGE_BOOTLOADER,
+    ESP_IMAGE_APPLICATION
+} esp_image_type;
+
 /**
  * @brief Calculate crc for the OTA data partition.
  *
@@ -103,23 +108,16 @@ uint8_t bootloader_common_get_chip_revision(void);
 /**
  * @brief Check if the image (bootloader and application) has valid chip ID and revision
  *
- * @param img_hdr: image header
+ * @param[in] img_hdr: image header
+ * @param[in] type: image type, bootloader or application
  * @return
  *      - ESP_OK: image and chip are matched well
  *      - ESP_FAIL: image doesn't match to the chip
  */
-esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr);
+esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr, esp_image_type type);
 
 
 /**
  * @brief Configure VDDSDIO, call this API to rise VDDSDIO to 1.9V when VDDSDIO regulator is enabled as 1.8V mode.
  */
 void bootloader_common_vddsdio_configure();
-
-/**
- * @brief Set the flash CS setup and hold time.
- *
- * CS setup time is recomemded to be 1.5T, and CS hold time is recommended to be 2.5T.
- * cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1
- */
-void bootloader_common_set_flash_cs_timing();

tools/sdk/bin/bootloader_dio_80m.bin

@@ -0,0 +1,71 @@
+// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "esp_image_format.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Update the flash id in g_rom_flashchip(global esp_rom_spiflash_chip_t structure).
+ *
+ * @return None
+ */
+void bootloader_flash_update_id();
+
+/**
+ * @brief Set the flash CS setup and hold time.
+ *
+ * @note CS setup time is recomemded to be 1.5T, and CS hold time is recommended to be 2.5T.
+ *       cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1.
+ *
+ * @return None
+ */
+void bootloader_flash_cs_timing_config();
+
+/**
+ * @brief Configure SPI flash clock.
+ *
+ * @note This function only set clock frequency for SPI0.
+ *
+ * @param pfhdr Pointer to App image header, from where to fetch flash settings.
+ *
+ * @return None
+ */
+void bootloader_flash_clock_config(const esp_image_header_t* pfhdr);
+
+/**
+ * @brief Configure SPI flash gpio, include the IO matrix and drive strength configuration.
+ *
+ * @param pfhdr Pointer to App image header, from where to fetch flash settings.
+ *
+ * @return None
+ */
+void bootloader_flash_gpio_config(const esp_image_header_t* pfhdr);
+
+/**
+ * @brief Configure SPI flash read dummy based on different mode and frequency.
+ *
+ * @param pfhdr Pointer to App image header, from where to fetch flash settings.
+ *
+ * @return None
+ */
+void bootloader_flash_dummy_config(const esp_image_header_t* pfhdr);
+
+#ifdef __cplusplus
+}
+#endif

tools/sdk/bin/bootloader_dout_40m.bin

@@ -30,7 +30,7 @@ typedef enum {
     ESP_SPP_NO_RESOURCE             /*!< No more set pm control block */
 } esp_spp_status_t;
 
-/* Security Setting Mask */
+/* Security Setting Mask, Only support ESP_SPP_SEC_AUTHORIZE.*/
 #define ESP_SPP_SEC_NONE            0x0000    /*!< No security. relate to BTA_SEC_NONE in bta/bta_api.h */
 #define ESP_SPP_SEC_AUTHORIZE       0x0001    /*!< Authorization required (only needed for out going connection ) relate to BTA_SEC_AUTHORIZE in bta/bta_api.h*/
 #define ESP_SPP_SEC_AUTHENTICATE    0x0012    /*!< Authentication required.  relate to BTA_SEC_AUTHENTICATE in bta/bta_api.h*/
@@ -229,7 +229,7 @@ esp_err_t esp_spp_start_discovery(esp_bd_addr_t bd_addr);
  *              When the connection is established or failed,
  *              the callback is called with ESP_SPP_OPEN_EVT.
  *
- * @param[in]   sec_mask:     Security Setting Mask .
+ * @param[in]   sec_mask:     Security Setting Mask. Only support ESP_SPP_SEC_AUTHORIZE.
  * @param[in]   role:         Master or slave.
  * @param[in]   remote_scn:   Remote device bluetooth device SCN.
  * @param[in]   peer_bd_addr: Remote device bluetooth device address.
@@ -260,7 +260,7 @@ esp_err_t esp_spp_disconnect(uint32_t handle);
  *              When the connection is established, the callback is called
  *              with ESP_SPP_SRV_OPEN_EVT.
  *
- * @param[in]   sec_mask:     Security Setting Mask .
+ * @param[in]   sec_mask:     Security Setting Mask. Only support ESP_SPP_SEC_AUTHORIZE.
  * @param[in]   role:         Master or slave.
  * @param[in]   local_scn:    The specific channel you want to get.
  *                            If channel is 0, means get any channel.

tools/sdk/bin/bootloader_dout_80m.bin

@@ -173,6 +173,7 @@
 #define CONFIG_ESP32_WIFI_NVS_ENABLED 1
 #define CONFIG_MDNS_MAX_SERVICES 10
 #define CONFIG_ULP_COPROC_ENABLED 1
+#define CONFIG_LSSH_SPARSE_MN_5 1
 #define CONFIG_HFP_AUDIO_DATA_PATH_PCM 1
 #define CONFIG_EMAC_CHECK_LINK_PERIOD_MS 2000
 #define CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL 1
@@ -360,5 +361,5 @@
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
 #define CONFIG_ESP32_WIFI_IRAM_OPT 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "90af68bd3"
+#define CONFIG_ARDUINO_IDF_COMMIT "fcc1516fa"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.2"