esp32: Update to latest ESP IDF version.

dpgeorge · dpgeorge · commit ec5edba58ae4 · 2017-04-03T15:37:29.000+10:00
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := c06cc31d85cc700e1dbddbe527d4282c4bc5845a
+ESPIDF_SUPHASH := 47b8f78cb0e15fa43647788a808dac353167a485
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -571,7 +571,7 @@ APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libc.a
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libm.a
 APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
-APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lrtc_clk -lpp -lwpa -lsmartconfig -lcoexist
+APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lrtc_clk -lrtc_pm -lpp -lwpa -lsmartconfig -lcoexist
 APP_LD_ARGS += $(OBJ)
 APP_LD_ARGS += --end-group
 
diff --git a/esp32/esp32.custom_common.ld b/esp32/esp32.custom_common.ld
@@ -71,6 +71,10 @@ SECTIONS
     *(.init.literal)
     *(.init)
     _init_end = ABSOLUTE(.);
+
+    /* This goes here, not at top of linker script, so addr2line finds it last,
+       and uses it in preference to the first symbol in IRAM */
+    _iram_start = ABSOLUTE(0);
   } > iram0_0_seg
 
   .iram0.text :
@@ -81,9 +85,11 @@ SECTIONS
     *freertos/*(.literal .text .literal.* .text.*)
     *esp32/panic.o(.literal .text .literal.* .text.*)
     *esp32/core_dump.o(.literal .text .literal.* .text.*)
+    *esp32/heap_alloc_caps.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *librtc_clk.a:(.literal .text .literal.* .text.*)
+    *librtc_pm.a:(.literal .text .literal.* .text.*)
     *libpp.a:pp.o(.literal .text .literal.* .text.*)
     *libpp.a:lmac.o(.literal .text .literal.* .text.*)
     *libpp.a:wdev.o(.literal .text .literal.* .text.*)
@@ -193,5 +199,11 @@ SECTIONS
     *(.gnu.version)
     _text_end = ABSOLUTE(.);
     _etext = .;
+
+    /* Similar to _iram_start, this symbol goes here so it is
+       resolved by addr2line in preference to the first symbol in
+       the flash.text segment.
+    */
+    _flash_cache_start = ABSOLUTE(0);
   } >iram0_2_seg
 }
diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h
@@ -17,6 +17,8 @@
 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
 #define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10
 #define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 0
+#define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
+#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
 #define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 
@@ -43,6 +45,9 @@
 #define CONFIG_BTC_TASK_STACK_SIZE 3072
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 4096
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
+#define CONFIG_TIMER_TASK_PRIORITY 1
+#define CONFIG_TIMER_TASK_STACK_DEPTH 2048
+#define CONFIG_TIMER_QUEUE_LENGTH 10
 
 #define CONFIG_SECURE_BOOTLOADER_DISABLED 1
 #define CONFIG_NEWLIB_STDOUT_ADDCR 1
