update IDF libs

espressif · Jan 19, 2017 · 78f2c6f · 78f2c6f
1 parent ada57f3
commit 78f2c6f
Show file tree

Hide file tree

Showing 43 changed files with 15 additions and 11 deletions.
diff --git a/tools/sdk/bin/bootloader.bin b/tools/sdk/bin/bootloader.bin
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
@@ -42,6 +42,7 @@
 #define CONFIG_ULP_COPROC_ENABLED 1
 #define CONFIG_DMA_RX_BUF_NUM 10
 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1
+#define CONFIG_TCP_SYNMAXRTX 6
 #define CONFIG_PYTHON "python"
 #define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
@@ -64,6 +65,7 @@
 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
+#define CONFIG_TCP_MAXRTX 12
 #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
 #define CONFIG_LWIP_SO_REUSE 1
 #define CONFIG_DMA_TX_BUF_NUM 10
@@ -83,6 +85,6 @@
 #define CONFIG_LWIP_SO_RCVBUF 1
 #define CONFIG_MBEDTLS_HARDWARE_MPI 1
 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
-#define CONFIG_ESPTOOLPY_PORT "/dev/cu.usbserial-0040121AB"
+#define CONFIG_ESPTOOLPY_PORT "/dev/cu.usbserial-0030121AB"
 #define CONFIG_ESP32_PANIC_PRINT_HALT 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
diff --git a/tools/sdk/include/esp32/esp_system.h b/tools/sdk/include/esp32/esp_system.h
@@ -124,7 +124,12 @@ esp_err_t system_efuse_read_mac(uint8_t mac[6]) __attribute__ ((deprecated));
  */
 const char* system_get_sdk_version(void)  __attribute__ ((deprecated));
 
-
+/**
+ * Get IDF version
+ *
+ * @return constant string from IDF_VER
+ */
+const char* esp_get_idf_version(void);
 
 #ifdef __cplusplus
 }

diff --git a/tools/sdk/include/freertos/freertos/FreeRTOSConfig.h b/tools/sdk/include/freertos/freertos/FreeRTOSConfig.h
@@ -90,10 +90,6 @@
 #define XT_TIMER_INDEX 0
 #elif CONFIG_FREERTOS_CORETIMER_1
 #define XT_TIMER_INDEX 1
-#elif CONFIG_FREERTOS_CORETIMER_2
-#define XT_TIMER_INDEX 2
-#elif CONFIG_FREERTOS_CORETIMER_3
-#define XT_TIMER_INDEX 3
 #endif
 
 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS

diff --git a/tools/sdk/include/lwip/lwipopts.h b/tools/sdk/include/lwip/lwipopts.h
@@ -288,12 +288,12 @@
 /**
  * TCP_MAXRTX: Maximum number of retransmissions of data segments.
  */
-#define TCP_MAXRTX                      12  //(*(volatile uint32*)0x600011E8)
+#define TCP_MAXRTX                      CONFIG_TCP_MAXRTX
 
 /**
  * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
  */
-#define TCP_SYNMAXRTX                   6   //(*(volatile uint32*)0x600011E4)
+#define TCP_SYNMAXRTX                   CONFIG_TCP_SYNMAXRTX
 
 /**
  * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.

diff --git a/tools/sdk/include/lwip/port/lwipopts.h b/tools/sdk/include/lwip/port/lwipopts.h
@@ -288,12 +288,12 @@
 /**
  * TCP_MAXRTX: Maximum number of retransmissions of data segments.
  */
-#define TCP_MAXRTX                      12  //(*(volatile uint32*)0x600011E8)
+#define TCP_MAXRTX                      CONFIG_TCP_MAXRTX
 
 /**
  * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
  */
-#define TCP_SYNMAXRTX                   6   //(*(volatile uint32*)0x600011E4)
+#define TCP_SYNMAXRTX                   CONFIG_TCP_SYNMAXRTX
 
 /**
  * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.

diff --git a/tools/sdk/include/newlib/assert.h b/tools/sdk/include/newlib/assert.h
@@ -11,7 +11,7 @@ extern "C" {
 #undef assert
 
 #ifdef NDEBUG           /* required by ANSI standard */
-# define assert(__e) ((void)0)
+# define assert(__e) ((void) sizeof(__e))
 #else
 # define assert(__e) ((__e) ? (void)0 : __assert_func (__FILE__, __LINE__, \
 						       __ASSERT_FUNC, #__e))

diff --git a/tools/sdk/ld/esp32.common.ld b/tools/sdk/ld/esp32.common.ld
@@ -84,6 +84,7 @@ SECTIONS
     *librtc.a:(.literal .text .literal.* .text.*)
     *libpp.a:(.literal .text .literal.* .text.*)
     *libhal.a:(.literal .text .literal.* .text.*)
+    *libcoexist.a:(.literal .text .literal.* .text.*)
     _iram_text_end = ABSOLUTE(.);
   } > iram0_0_seg
 

diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
diff --git a/tools/sdk/lib/libbtdm_app.a b/tools/sdk/lib/libbtdm_app.a
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
diff --git a/tools/sdk/lib/libcore.a b/tools/sdk/lib/libcore.a
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a