Skip to content

Commit 48613b6

Browse files
dpgeorgedpgeorge
committed
esp32: Update to latest ESP IDF.
This update requires the xtensa-esp32-elf to be upgraded to the latest version, 1.22.0-73-ge28a011-5.2.0.
1 parent a5808e2 commit 48613b6

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

‎ports/esp32/Makefile‎

Lines changed: 6 additions & 2 deletions
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 := 9a26296a0e88a4c3ae27e9c848be970946fff87e
32+
ESPIDF_SUPHASH := 2c95a77cf93781f296883d5dbafcdc18e4389656
3333
ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
3434
ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
3535
$(info ** WARNING **)
@@ -214,6 +214,7 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
214214

215215
$(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
216216
ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
217+
brownout.o \
217218
panic.o \
218219
esp_timer.o \
219220
esp_timer_esp32.o \
@@ -240,6 +241,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
240241
intr_alloc.o \
241242
dport_access.o \
242243
wifi_init.o \
244+
wifi_internal.o \
243245
)
244246

245247
ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
@@ -281,6 +283,7 @@ ESPIDF_EXPAT_O = $(addprefix $(ESPCOMP)/expat/,\
281283

282284
ESPIDF_PTHREAD_O = $(addprefix $(ESPCOMP)/pthread/,\
283285
pthread.o \
286+
pthread_local_storage.o \
284287
)
285288

286289
# Assembler .S files need only basic flags, and in particular should not have
@@ -447,6 +450,7 @@ ESPIDF_LWIP_O = $(addprefix $(ESPCOMP)/lwip/,\
447450
port/freertos/sys_arch.o \
448451
port/netif/wlanif.o \
449452
port/netif/ethernetif.o \
453+
port/vfs_lwip.o \
450454
)
451455

452456
ESPIDF_MBEDTLS_O = $(addprefix $(ESPCOMP)/mbedtls/,\
@@ -615,7 +619,7 @@ APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
615619
APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libc.a
616620
APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libm.a
617621
APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
618-
APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist
622+
APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist -lwps -lwpa2
619623
APP_LD_ARGS += $(OBJ)
620624
APP_LD_ARGS += --end-group
621625

‎ports/esp32/esp32.custom_common.ld‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,14 @@ SECTIONS
8989
*esp32/core_dump.o(.literal .text .literal.* .text.*)
9090
*app_trace/*(.literal .text .literal.* .text.*)
9191
*xtensa-debug-module/eri.o(.literal .text .literal.* .text.*)
92-
*esp32/app_trace.o(.literal .text .literal.* .text.*)
9392
*libphy.a:(.literal .text .literal.* .text.*)
9493
*librtc.a:(.literal .text .literal.* .text.*)
9594
*libsoc.a:(.literal .text .literal.* .text.*)
9695
*libhal.a:(.literal .text .literal.* .text.*)
9796
*libgcc.a:lib2funcs.o(.literal .text .literal.* .text.*)
9897
*spi_flash/spi_flash_rom_patch.o(.literal .text .literal.* .text.*)
98+
*libgcov.a:(.literal .text .literal.* .text.*)
99+
INCLUDE esp32.spiram.rom-functions-iram.ld
99100
*py/scheduler.o*(.literal .text .literal.* .text.*)
100101
_iram_text_end = ABSOLUTE(.);
101102
} > iram0_0_seg
@@ -117,9 +118,12 @@ SECTIONS
117118
*(.dram1 .dram1.*)
118119
*esp32/panic.o(.rodata .rodata.*)
119120
*libphy.a:(.rodata .rodata.*)
120-
*app_trace/app_trace.o:(.rodata .rodata.*)
121+
*soc/esp32/rtc_clk.o(.rodata .rodata.*)
122+
*app_trace/app_trace.o(.rodata .rodata.*)
123+
*libgcov.a:(.rodata .rodata.*)
121124
*heap/multi_heap.o(.rodata .rodata.*)
122125
*heap/multi_heap_poisoning.o(.rodata .rodata.*)
126+
INCLUDE esp32.spiram.rom-functions-dram.ld
123127
_data_end = ABSOLUTE(.);
124128
. = ALIGN(4);
125129
} >dram0_0_seg

‎ports/esp32/sdkconfig.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
99
#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
1010

11+
#define CONFIG_BROWNOUT_DET 1
12+
#define CONFIG_BROWNOUT_DET_LVL 0
13+
#define CONFIG_BROWNOUT_DET_LVL_SEL_0 1
14+
1115
#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
16+
#define CONFIG_TCPIP_RECVMBOX_SIZE 32
1217

1318
#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
1419
#define CONFIG_ESP32_PHY_MAX_TX_POWER 20
@@ -101,6 +106,7 @@
101106
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
102107
#define CONFIG_LWIP_MAX_SOCKETS 8
103108
#define CONFIG_LWIP_SO_REUSE 1
109+
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
104110
#define CONFIG_IP_LOST_TIMER_INTERVAL 120
105111
#define CONFIG_UDP_RECVMBOX_SIZE 6
106112
#define CONFIG_TCP_MAXRTX 12

0 commit comments

Comments
 (0)