Merge branch 'dev-idf-1e0710f' into dev-bluetooth

MrSurly · MrSurly · commit c1079bea5827 · 2017-05-15T09:22:21.000-07:00
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -30,7 +30,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := f73c6f875cc564fa6c9962be71eac4dbdc56aa63
+ESPIDF_SUPHASH := 1e0710f1b24429a316c9c34732aa17bd3f189421
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -249,6 +249,7 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
 	gpio.o \
 	timer.o \
 	spi_master.o \
+	spi_common.o \
 	rtc_module.o \
 	)
 
@@ -258,6 +259,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	event_default_handlers.o \
 	task_wdt.o \
 	cache_err_int.o \
+	clk.o \
 	core_dump.o \
 	cpu_start.o \
 	gdbstub.o \
@@ -267,7 +269,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	ipc.o \
 	int_wdt.o \
 	event_loop.o \
-	cpu_freq.o \
 	hwcrypto/sha.o \
 	hwcrypto/aes.o \
 	lib_printf.o \
@@ -276,6 +277,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	hw_random.o \
 	phy_init.o \
 	intr_alloc.o \
+	dport_access.o \
 	)
 
 ESPIDF_SOC_O = $(addprefix $(ESPCOMP)/soc/,\
@@ -812,6 +814,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
 	log/log.o \
 	spi_flash/spi_flash_rom_patch.o \
 	soc/esp32/rtc_clk.o \
+	soc/esp32/rtc_time.o \
 	micro-ecc/micro-ecc/uECC.o \
 	bootloader/src/main/bootloader_start.o \
 	)
diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h
@@ -6,6 +6,10 @@
 #define CONFIG_BT_DRAM_RELEASE 1
 
 #define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
+#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS y
+#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
+
+#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
 #define CONFIG_ESP32_PHY_AUTO_INIT 1
@@ -26,6 +30,10 @@
 #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_ESP32_XTAL_FREQ_AUTO y
+#define CONFIG_ESP32_XTAL_FREQ 0
+#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
+
 #define CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1
 #define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 
@@ -37,7 +45,6 @@
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 0
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 0
 
-#define CONFIG_FREERTOS_UNICORE 1
 #define CONFIG_FREERTOS_CORETIMER_0 1
 #define CONFIG_FREERTOS_HZ 100
 #define CONFIG_FREERTOS_ASSERT_FAIL_ABORT 1
