Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit 3580284

Browse files
Roosted7dpgeorge
authored andcommitted
esp32: Update to latest ESP-IDF.
1 parent 56f0513 commit 3580284

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

esp32/Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
2929
ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
3030

3131
# verify the ESP IDF version
32-
ESPIDF_SUPHASH := cc93e14770e7b3681ebc80b30336e498cc96e961
32+
ESPIDF_SUPHASH := 9b955f4c9f1b32652ea165d3e4cdaad01bba170e
3333
ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
3434
ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
3535
$(info ** WARNING **)
@@ -78,7 +78,7 @@ INC += -I$(ESPCOMP)/xtensa-debug-module/include
7878
INC += -I$(ESPCOMP)/wpa_supplicant/include
7979
INC += -I$(ESPCOMP)/wpa_supplicant/port/include
8080
INC += -I$(ESPCOMP)/ethernet/include
81-
INC += -I$(ESPCOMP)/tcpip_adapter/include
81+
INC += -I$(ESPCOMP)/app_trace/include
8282

8383
CFLAGS = -std=gnu99 -Os -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Werror -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM $(INC)
8484
CFLAGS += -DIDF_VER=\"$(IDF_VER)\"
@@ -209,7 +209,6 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
209209

210210
$(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
211211
ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
212-
app_trace.o \
213212
panic.o \
214213
event_default_handlers.o \
215214
task_wdt.o \
@@ -318,6 +317,10 @@ ESPIDF_TCPIP_ADAPTER_O = $(addprefix $(ESPCOMP)/tcpip_adapter/,\
318317
tcpip_adapter_lwip.o \
319318
)
320319

320+
ESPIDF_APP_TRACE_O = $(addprefix $(ESPCOMP)/app_trace/,\
321+
app_trace.o \
322+
)
323+
321324
ESPIDF_NEWLIB_O = $(addprefix $(ESPCOMP)/newlib/,\
322325
time.o \
323326
syscalls.o \
@@ -548,6 +551,7 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_LWIP_O))
548551
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_MBEDTLS_O))
549552
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_XTENSA_DEBUG_MODULE_O))
550553
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_TCPIP_ADAPTER_O))
554+
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_TRACE_O))
551555
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NGHTTP_O))
552556
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NVS_FLASH_O))
553557
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_OPENSSL_O))

esp32/sdkconfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@
9393
#define CONFIG_LWIP_SO_REUSE 1
9494
#define CONFIG_TCP_MAXRTX 12
9595
#define CONFIG_TCP_SYNMAXRTX 6
96+
#define CONFIG_TCP_MSS 1436
97+
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
98+
#define CONFIG_TCP_WND_DEFAULT 5744
99+
#define CONFIG_TCP_QUEUE_OOSEQ 1
100+
#define CONFIG_TCP_OVERSIZE_MSS 1
96101

97102
#define CONFIG_MBEDTLS_HARDWARE_AES 1
98103
#define CONFIG_MBEDTLS_HARDWARE_MPI 1

0 commit comments

Comments
 (0)