esp32: Update to the latest IDF from Espressif.

Hash: f73c6f875cc564fa6c9962be71eac4dbdc56aa63

Author: Daniel Campora

esp32/Makefile

@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := 375b28650bd1c90d6ac706f63cde9a64d9a7e3e5
+ESPIDF_SUPHASH := f73c6f875cc564fa6c9962be71eac4dbdc56aa63
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -55,6 +55,7 @@ INC += -I$(ESPCOMP)/driver/include/driver
 INC += -I$(ESPCOMP)/nghttp/port/include
 INC += -I$(ESPCOMP)/nghttp/include
 INC += -I$(ESPCOMP)/esp32/include
+INC += -I$(ESPCOMP)/soc/esp32/include
 INC += -I$(ESPCOMP)/ethernet/include
 INC += -I$(ESPCOMP)/expat/include/expat
 INC += -I$(ESPCOMP)/expat/port/include
@@ -252,16 +253,25 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	int_wdt.o \
 	event_loop.o \
 	cpu_freq.o \
-	brownout.o \
 	hwcrypto/sha.o \
 	hwcrypto/aes.o \
 	lib_printf.o \
 	freertos_hooks.o \
-	cpu_util.o \
 	system_api.o \
 	hw_random.o \
 	phy_init.o \
 	intr_alloc.o \
+	cache_err_int.o \
+	)
+
+ESPIDF_SOC_O = $(addprefix $(ESPCOMP)/soc/,\
+	esp32/brownout.o \
+	esp32/cpu_util.o \
+	esp32/rtc_clk.o \
+	esp32/rtc_init.o \
+	esp32/rtc_pm.o \
+	esp32/rtc_sleep.o \
+	esp32/rtc_time.o \
 	)
 
 ESPIDF_CXX_O = $(addprefix $(ESPCOMP)/cxx/,\
@@ -291,7 +301,7 @@ CFLAGS_ASM = -I$(ESPCOMP)/esp32/include -I$(ESPCOMP)/freertos/include/freertos -
 $(BUILD)/$(ESPCOMP)/freertos/portasm.o: CFLAGS = $(CFLAGS_ASM)
 $(BUILD)/$(ESPCOMP)/freertos/xtensa_context.o: CFLAGS = $(CFLAGS_ASM)
 $(BUILD)/$(ESPCOMP)/freertos/xtensa_intr_asm.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/xtensa_vectors.o: CFLAGS = $(CFLAGS_ASM)
+$(BUILD)/$(ESPCOMP)/freertos/xtensa_vectors.o: CFLAGS = $(CFLAGS_ASM) -I$(ESPCOMP)/soc/esp32/include
 $(BUILD)/$(ESPCOMP)/freertos/%.o: CFLAGS += -I$(ESPCOMP)/freertos/include/freertos
 ESPIDF_FREERTOS_O = $(addprefix $(ESPCOMP)/freertos/,\
 	croutine.o \
@@ -401,7 +411,7 @@ ESPIDF_LWIP_O = $(addprefix $(ESPCOMP)/lwip/,\
 	api/err.o \
 	api/api_msg.o \
 	api/sockets.o \
-	api/lwip_debug.o \
+	port/debug/lwip_debug.o \
 	apps/sntp/sntp.o \
 	apps/dhcpserver.o \
 	core/ipv4/ip_frag.o \
@@ -552,9 +562,9 @@ ESPIDF_WPA_SUPPLICANT_O = $(addprefix $(ESPCOMP)/wpa_supplicant/,\
 	port/os_xtensa.o \
 	)
 
+$(BUILD)/$(ESPCOMP)/bt/%.o: CFLAGS := $(INC_BT) $(CFLAGS)
 $(BUILD)/$(ESPCOMP)/bt/bluedroid/btc/profile/esp/blufi/%.o: CFLAGS += -Wno-strict-aliasing
 $(BUILD)/$(ESPCOMP)/bt/bluedroid/stack/btu/%.o: CFLAGS += -Wno-strict-aliasing
-$(BUILD)/$(ESPCOMP)/bt/%.o: CFLAGS += $(INC_BT)
 ESPIDF_BT_O = $(addprefix $(ESPCOMP)/bt/,\
 	bt.o \
 	bluedroid/api/esp_blufi_api.o \
@@ -593,10 +603,18 @@ ESPIDF_BT_O = $(addprefix $(ESPCOMP)/bt/,\
 	bluedroid/bta/sys/bta_sys_conn.o \
 	bluedroid/bta/sys/bta_sys_main.o \
 	bluedroid/bta/sys/utl.o \
+	bluedroid/btc/core/btc_alarm.o \
+	bluedroid/btc/core/btc_ble_storage.o \
+	bluedroid/btc/core/btc_config.o \
+	bluedroid/btc/core/btc_dev.o \
+	bluedroid/btc/core/btc_dm.o \
 	bluedroid/btc/core/btc_main.o \
 	bluedroid/btc/core/btc_manage.o \
 	bluedroid/btc/core/btc_sec.o \
+	bluedroid/btc/core/btc_sm.o \
+	bluedroid/btc/core/btc_storage.o \
 	bluedroid/btc/core/btc_task.o \
+	bluedroid/btc/core/btc_util.o \
 	bluedroid/btc/profile/esp/blufi/blufi_prf.o \
 	bluedroid/btc/profile/esp/blufi/blufi_protocol.o \
 	bluedroid/btc/profile/std/gap/btc_gap_ble.o \
@@ -622,6 +640,7 @@ ESPIDF_BT_O = $(addprefix $(ESPCOMP)/bt/,\
 	bluedroid/osi/alarm.o \
 	bluedroid/osi/allocator.o \
 	bluedroid/osi/buffer.o \
+	bluedroid/osi/config.o \
 	bluedroid/osi/fixed_queue.o \
 	bluedroid/osi/future.o \
 	bluedroid/osi/hash_functions.o \
@@ -696,6 +715,7 @@ OBJ_ESPIDF =
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NEWLIB_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_DRIVER_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_ESP32_O))
+OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_SOC_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_CXX_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_ETHERNET_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_EXPAT_O))
@@ -748,7 +768,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 -lrtc_pm -lpp -lwpa -lsmartconfig -lcoexist
+APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist
 APP_LD_ARGS += $(ESPCOMP)/bt/lib/libbtdm_app.a
 APP_LD_ARGS += $(OBJ)
 APP_LD_ARGS += --end-group
@@ -784,7 +804,7 @@ $(BUILD)/%.o: %.cpp
 ################################################################################
 # Declarations to build the bootloader
 
-$(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/bootloader_support/include_priv -I$(ESPCOMP)/bootloader_support/include -I$(ESPCOMP)/micro-ecc/micro-ecc -I$(ESPCOMP)/esp32 -Wno-error=format
+$(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/bootloader_support/include_priv -I$(ESPCOMP)/bootloader_support/include -I$(ESPCOMP)/micro-ecc/micro-ecc -I$(ESPCOMP)/esp32 -I$(ESPCOMP)/soc/esp32/include -Wno-error=format
 BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
 	bootloader_support/src/bootloader_flash.o \
 	bootloader_support/src/bootloader_random.o \
@@ -797,12 +817,13 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
 	spi_flash/spi_flash_rom_patch.o \
 	micro-ecc/micro-ecc/uECC.o \
 	bootloader/src/main/bootloader_start.o \
+	soc/esp32/rtc_clk.o \
 	)
 
 BOOTLOADER_LIBS =
 BOOTLOADER_LIBS += -Wl,--start-group
 BOOTLOADER_LIBS += $(BOOTLOADER_OBJ)
-BOOTLOADER_LIBS += -L$(ESPCOMP)/esp32/lib -lrtc -lrtc_clk
+BOOTLOADER_LIBS += -L$(ESPCOMP)/esp32/lib -lrtc
 BOOTLOADER_LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
 BOOTLOADER_LIBS += -Wl,--end-group