esp32: Update to latest ESP IDF.

Author: dpgeorge

esp32/Makefile

@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := 9b955f4c9f1b32652ea165d3e4cdaad01bba170e
+ESPIDF_SUPHASH := 4ec2abbf23084ac060679e4136fa222a2d0ab0e8
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -55,10 +55,12 @@ INC += -I$(ESPCOMP)/driver/include/driver
 INC += -I$(ESPCOMP)/nghttp/port/include
 INC += -I$(ESPCOMP)/nghttp/nghttp2/lib/includes
 INC += -I$(ESPCOMP)/esp32/include
+INC += -I$(ESPCOMP)/soc/include
 INC += -I$(ESPCOMP)/soc/esp32/include
 INC += -I$(ESPCOMP)/ethernet/include
 INC += -I$(ESPCOMP)/expat/include/expat
 INC += -I$(ESPCOMP)/expat/port/include
+INC += -I$(ESPCOMP)/heap/include
 INC += -I$(ESPCOMP)/json/include
 INC += -I$(ESPCOMP)/json/port/include
 INC += -I$(ESPCOMP)/log/include
@@ -219,7 +221,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	gdbstub.o \
 	crosscore_int.o \
 	deep_sleep.o \
-	heap_alloc_caps.o \
 	ipc.o \
 	int_wdt.o \
 	event_loop.o \
@@ -234,14 +235,20 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	dport_access.o \
 	)
 
+ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
+	heap_caps.o \
+	heap_caps_init.o \
+	multi_heap.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 \
+	esp32/soc_memory_layout.o \
 	)
 
 ESPIDF_CXX_O = $(addprefix $(ESPCOMP)/cxx/,\
@@ -277,8 +284,6 @@ ESPIDF_FREERTOS_O = $(addprefix $(ESPCOMP)/freertos/,\
 	croutine.o \
 	event_groups.o \
 	FreeRTOS-openocd.o \
-	heap_regions_debug.o \
-	heap_regions.o \
 	list.o \
 	portasm.o \
 	port.o \
@@ -539,6 +544,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_HEAP_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_SOC_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_CXX_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_ETHERNET_O))

esp32/machine_uart.c

@@ -237,8 +237,8 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     // Setup
     uart_param_config(self->uart_num, &uartcfg);
 
-    // RX and TX buffers are currently hardcoded at 256 and 64 bytes respectively.
-    uart_driver_install(uart_num, 256, 64, 10, &UART_QUEUE[self->uart_num], 0);
+    // RX and TX buffers are currently hardcoded at 256 bytes each (IDF minimum).
+    uart_driver_install(uart_num, 256, 256, 10, &UART_QUEUE[self->uart_num], 0);
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);

esp32/sdkconfig.h

@@ -51,13 +51,15 @@
 #define CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION 1
 #define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE 1
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 2
+#define CONFIG_FREERTOS_IDLE_TASK_STACKSIZE 1024
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG 1
 #define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
 #define CONFIG_SUPPORT_STATIC_ALLOCATION 1
 #define CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK 1
 
 #define CONFIG_MAIN_TASK_STACK_SIZE 4096
+#define CONFIG_IPC_TASK_STACK_SIZE 1024
 #define CONFIG_BTC_TASK_STACK_SIZE 3072
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 4096
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32