diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 979ca4afa..2eae802be 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := 4ec2abbf23084ac060679e4136fa222a2d0ab0e8
+ESPIDF_SUPHASH := 9a26296a0e88a4c3ae27e9c848be970946fff87e
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -93,9 +93,14 @@ CXXFLAGS = -std=gnu++11 -fno-exceptions -fno-rtti -ffunction-sections -fdata-sec
 
 LDFLAGS = -nostdlib -Map=$(@:.elf=.map) --cref
 LDFLAGS += --gc-sections -static -EL
-LDFLAGS += -u call_user_start_cpu0 -u uxTopUsedPriority
+LDFLAGS += -u call_user_start_cpu0 -u uxTopUsedPriority -u ld_include_panic_highint_hdl
 LDFLAGS += -u __cxa_guard_dummy # so that implementation of static guards is taken from cxx_guards.o instead of libstdc++.a
-LDFLAGS += -L$(ESPCOMP)/esp32/ld -T $(BUILD)/esp32_out.ld -T ./esp32.custom_common.ld -T esp32.rom.ld -T esp32.rom.spiflash.ld -T esp32.peripherals.ld
+LDFLAGS += -L$(ESPCOMP)/esp32/ld
+LDFLAGS += -T $(BUILD)/esp32_out.ld
+LDFLAGS += -T ./esp32.custom_common.ld
+LDFLAGS += -T esp32.rom.ld
+LDFLAGS += -T esp32.rom.spiram_incompatible_fns.ld
+LDFLAGS += -T esp32.peripherals.ld
 
 LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBSTDCXX_FILE_NAME = $(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)
@@ -209,7 +214,11 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
 $(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
 ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	panic.o \
+	esp_timer.o \
+	esp_timer_esp32.o \
+	ets_timer_legacy.o \
 	event_default_handlers.o \
+	fast_crypto_ops.o \
 	task_wdt.o \
 	cache_err_int.o \
 	clk.o \
@@ -217,7 +226,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	cpu_start.o \
 	gdbstub.o \
 	crosscore_int.o \
-	deep_sleep.o \
 	ipc.o \
 	int_wdt.o \
 	event_loop.o \
@@ -230,6 +238,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	phy_init.o \
 	intr_alloc.o \
 	dport_access.o \
+	wifi_init.o \
 	)
 
 ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
@@ -269,6 +278,10 @@ ESPIDF_EXPAT_O = $(addprefix $(ESPCOMP)/expat/,\
 	port/chardata.o \
 	)
 
+ESPIDF_PTHREAD_O = $(addprefix $(ESPCOMP)/pthread/,\
+	pthread.o \
+	)
+
 # Assembler .S files need only basic flags, and in particular should not have
 # -Os because that generates subtly different code.
 # We also need custom CFLAGS for .c files because FreeRTOS has headers with
@@ -295,6 +308,7 @@ ESPIDF_FREERTOS_O = $(addprefix $(ESPCOMP)/freertos/,\
 	xtensa_intr_asm.o \
 	xtensa_intr.o \
 	xtensa_overlay_os_hook.o \
+	xtensa_vector_defaults.o \
 	xtensa_vectors.o \
 	)
 
@@ -436,7 +450,6 @@ ESPIDF_LWIP_O = $(addprefix $(ESPCOMP)/lwip/,\
 
 ESPIDF_MBEDTLS_O = $(addprefix $(ESPCOMP)/mbedtls/,\
 	library/entropy.o \
-	library/net.o \
 	library/pkcs12.o \
 	library/ccm.o \
 	library/pk.o \
@@ -505,7 +518,6 @@ ESPIDF_MBEDTLS_O = $(addprefix $(ESPCOMP)/mbedtls/,\
 	library/ctr_drbg.o \
 	library/x509write_crt.o \
 	library/pk_wrap.o \
-	port/net.o \
 	port/esp_bignum.o \
 	port/esp_hardware.o \
 	port/esp_sha1.o \
@@ -536,6 +548,10 @@ ESPIDF_WPA_SUPPLICANT_O = $(addprefix $(ESPCOMP)/wpa_supplicant/,\
 	src/crypto/bignum.o \
 	src/crypto/crypto_internal-modexp.o \
 	src/crypto/crypto_internal-cipher.o \
+	src/fast_crypto/fast_aes-unwrap.o \
+	src/fast_crypto/fast_aes-wrap.o \
+	src/fast_crypto/fast_sha256.o \
+	src/fast_crypto/fast_sha256-internal.o \
 	port/os_xtensa.o \
 	)
 
@@ -548,6 +564,7 @@ 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))
+OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_PTHREAD_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_FREERTOS_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_VFS_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_JSON_O))
@@ -636,6 +653,7 @@ $(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/
 BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
 	bootloader_support/src/bootloader_flash.o \
 	bootloader_support/src/bootloader_random.o \
+	bootloader_support/src/bootloader_sha.o \
 	bootloader_support/src/secure_boot_signatures.o \
 	bootloader_support/src/secure_boot.o \
 	bootloader_support/src/esp_image_format.o \
@@ -646,7 +664,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
 	soc/esp32/rtc_clk.o \
 	soc/esp32/rtc_time.o \
 	micro-ecc/micro-ecc/uECC.o \
-	bootloader/src/main/bootloader_start.o \
+	bootloader/subproject/main/bootloader_start.o \
 	)
 
 BOOTLOADER_LIBS =
@@ -665,10 +683,10 @@ BOOTLOADER_LDFLAGS += -Wl,--gc-sections
 BOOTLOADER_LDFLAGS += -static
 BOOTLOADER_LDFLAGS += -Wl,-EL
 BOOTLOADER_LDFLAGS += -Wl,-Map=$(@:.elf=.map) -Wl,--cref
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/src/main/esp32.bootloader.ld
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/src/main/esp32.bootloader.rom.ld
+BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/subproject/main/esp32.bootloader.ld
+BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/subproject/main/esp32.bootloader.rom.ld
 BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.rom.ld
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.rom.spiflash.ld
+BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.rom.spiram_incompatible_fns.ld
 
 BOOTLOADER_OBJ_DIRS = $(sort $(dir $(BOOTLOADER_OBJ)))
 $(BOOTLOADER_OBJ): | $(BOOTLOADER_OBJ_DIRS)
diff --git a/ports/esp32/esp32.custom_common.ld b/ports/esp32/esp32.custom_common.ld
index 363b6b53c..45242f9af 100644
--- a/ports/esp32/esp32.custom_common.ld
+++ b/ports/esp32/esp32.custom_common.ld
@@ -83,14 +83,18 @@ SECTIONS
     _iram_text_start = ABSOLUTE(.);
     *(.iram1 .iram1.*)
     *freertos/*(.literal .text .literal.* .text.*)
+    *heap/multi_heap.o(.literal .text .literal.* .text.*)
+    *heap/multi_heap_poisoning.o(.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.*)
+    *app_trace/*(.literal .text .literal.* .text.*)
+    *xtensa-debug-module/eri.o(.literal .text .literal.* .text.*)
     *esp32/app_trace.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *libsoc.a:(.literal .text .literal.* .text.*)
     *libhal.a:(.literal .text .literal.* .text.*)
+    *libgcc.a:lib2funcs.o(.literal .text .literal.* .text.*)
     *spi_flash/spi_flash_rom_patch.o(.literal .text .literal.* .text.*)
     *py/scheduler.o*(.literal .text .literal.* .text.*)
     _iram_text_end = ABSOLUTE(.);
@@ -99,21 +103,23 @@ SECTIONS
   .dram0.data :
   {
     _data_start = ABSOLUTE(.);
-    KEEP(*(.data))
-    KEEP(*(.data.*))
-    KEEP(*(.gnu.linkonce.d.*))
-    KEEP(*(.data1))
-    KEEP(*(.sdata))
-    KEEP(*(.sdata.*))
-    KEEP(*(.gnu.linkonce.s.*))
-    KEEP(*(.sdata2))
-    KEEP(*(.sdata2.*))
-    KEEP(*(.gnu.linkonce.s2.*))
-    KEEP(*(.jcr))
+    *(.data)
+    *(.data.*)
+    *(.gnu.linkonce.d.*)
+    *(.data1)
+    *(.sdata)
+    *(.sdata.*)
+    *(.gnu.linkonce.s.*)
+    *(.sdata2)
+    *(.sdata2.*)
+    *(.gnu.linkonce.s2.*)
+    *(.jcr)
     *(.dram1 .dram1.*)
     *esp32/panic.o(.rodata .rodata.*)
-    *esp32/app_trace.o(.rodata .rodata.*)
     *libphy.a:(.rodata .rodata.*)
+    *app_trace/app_trace.o:(.rodata .rodata.*)
+    *heap/multi_heap.o(.rodata .rodata.*)
+    *heap/multi_heap_poisoning.o(.rodata .rodata.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
   } >dram0_0_seg
@@ -152,11 +158,13 @@ SECTIONS
     *(.rodata1)
     __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
     *(.xt_except_table)
-    *(.gcc_except_table)
+    *(.gcc_except_table .gcc_except_table.*)
     *(.gnu.linkonce.e.*)
     *(.gnu.version_r)
-    *(.eh_frame)
     . = (. + 3) & ~ 3;
+    __eh_frame = ABSOLUTE(.);
+    KEEP(*(.eh_frame))
+    . = (. + 7) & ~ 3;
     /*  C++ constructor and destructor tables, properly ordered:  */
     __init_array_start = ABSOLUTE(.);
     KEEP (*crtbegin.o(.ctors))
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index f3d69dfcf..d62f362e9 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -81,7 +81,7 @@ STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
 
 STATIC mp_obj_t madc_read(mp_obj_t self_in) {
     madc_obj_t *self = self_in;
-    int val = adc1_get_voltage(self->adc1_id);
+    int val = adc1_get_raw(self->adc1_id);
     if (val == -1) mp_raise_ValueError("Parameter Error");
     return MP_OBJ_NEW_SMALL_INT(val);
 }
diff --git a/ports/esp32/sdkconfig.h b/ports/esp32/sdkconfig.h
index de8630e4f..ce254c0e6 100644
--- a/ports/esp32/sdkconfig.h
+++ b/ports/esp32/sdkconfig.h
@@ -11,7 +11,6 @@
 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
-#define CONFIG_ESP32_PHY_AUTO_INIT 1
 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1
 #define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
@@ -29,12 +28,18 @@
 #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_WIFI_RX_BA_WIN 6
+#define CONFIG_ESP32_WIFI_TX_BA_WIN 6
 #define CONFIG_ESP32_XTAL_FREQ_AUTO 1
 #define CONFIG_ESP32_XTAL_FREQ 0
 #define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
+#define CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT 5
+#define CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
 
 #define CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1
-#define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
+#define CONFIG_DMA_RX_BUF_NUM 10
+#define CONFIG_DMA_TX_BUF_NUM 10
+#define CONFIG_EMAC_TASK_PRIORITY 20
 
 #define CONFIG_INT_WDT 1
 #define CONFIG_INT_WDT_TIMEOUT_MS 300
@@ -63,11 +68,13 @@
 #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_STACK_SIZE 4096
 #define CONFIG_TIMER_TASK_PRIORITY 1
 #define CONFIG_TIMER_TASK_STACK_DEPTH 2048
 #define CONFIG_TIMER_QUEUE_LENGTH 10
 
-#define CONFIG_NEWLIB_STDOUT_ADDCR 1
+#define CONFIG_NEWLIB_STDIN_LINE_ENDING_CR 1
+#define CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF 1
 #define CONFIG_PHY_ENABLED 1
 #define CONFIG_WIFI_ENABLED 1
 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
@@ -93,20 +100,63 @@
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_LWIP_MAX_SOCKETS 8
 #define CONFIG_LWIP_SO_REUSE 1
+#define CONFIG_IP_LOST_TIMER_INTERVAL 120
+#define CONFIG_UDP_RECVMBOX_SIZE 6
 #define CONFIG_TCP_MAXRTX 12
 #define CONFIG_TCP_SYNMAXRTX 6
+#define CONFIG_TCP_MSL 60000
 #define CONFIG_TCP_MSS 1436
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
 #define CONFIG_TCP_WND_DEFAULT 5744
 #define CONFIG_TCP_QUEUE_OOSEQ 1
 #define CONFIG_TCP_OVERSIZE_MSS 1
+#define CONFIG_TCP_RECVMBOX_SIZE 6
 
+#define CONFIG_MBEDTLS_AES_C 1
+#define CONFIG_MBEDTLS_CCM_C 1
+#define CONFIG_MBEDTLS_ECDH_C 1
+#define CONFIG_MBEDTLS_ECDSA_C 1
+#define CONFIG_MBEDTLS_ECP_C 1
+#define CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_MBEDTLS_ECP_NIST_OPTIM 1
+#define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_MBEDTLS_HARDWARE_AES 1
-#define CONFIG_MBEDTLS_HARDWARE_MPI 1
-#define CONFIG_MBEDTLS_HARDWARE_SHA 1
-#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
-#define CONFIG_MBEDTLS_MPI_USE_INTERRUPT 1
 #define CONFIG_MBEDTLS_HAVE_TIME 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE 1
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
+#define CONFIG_MBEDTLS_PEM_PARSE_C 1
+#define CONFIG_MBEDTLS_PEM_WRITE_C 1
+#define CONFIG_MBEDTLS_RC4_DISABLED 1
+#define CONFIG_MBEDTLS_SSL_ALPN 1
+#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
+#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 1
+#define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
+#define CONFIG_MBEDTLS_SSL_RENEGOTIATION 1
+#define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
+#define CONFIG_MBEDTLS_TLS_CLIENT 1
+#define CONFIG_MBEDTLS_TLS_ENABLED 1
+#define CONFIG_MBEDTLS_TLS_SERVER 1
+#define CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT 1
+#define CONFIG_MBEDTLS_X509_CRL_PARSE_C 1
+#define CONFIG_MBEDTLS_X509_CSR_PARSE_C 1
 
+#define CONFIG_MAKE_WARN_UNDEFINED_VARIABLES 1
 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-"
 #define CONFIG_PYTHON "python2"