Skip to content

Commit 4df414b

Browse files
committed
esp32: Update to latest ESP IDF.
1 parent 534aefd commit 4df414b

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

esp32/Makefile

Lines changed: 3 additions & 3 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 := 0a678ebe8c8bb78053f2a2dc4bd26124adde9122
32+
ESPIDF_SUPHASH := 13dfb5568dcc30aa43363c49f7a4505d04036424
3333
ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show --pretty=format:'%H')
3434
ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
3535
$(info ** WARNING **)
@@ -559,7 +559,7 @@ APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
559559
APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libc.a
560560
APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libm.a
561561
APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
562-
APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist
562+
APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lrtc_clk -lpp -lwpa -lsmartconfig -lcoexist
563563
APP_LD_ARGS += $(OBJ)
564564
APP_LD_ARGS += --end-group
565565

@@ -612,7 +612,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
612612
BOOTLOADER_LIBS =
613613
BOOTLOADER_LIBS += -Wl,--start-group
614614
BOOTLOADER_LIBS += $(BOOTLOADER_OBJ)
615-
BOOTLOADER_LIBS += -L$(ESPCOMP)/esp32/lib -lrtc
615+
BOOTLOADER_LIBS += -L$(ESPCOMP)/esp32/lib -lrtc -lrtc_clk
616616
BOOTLOADER_LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
617617
BOOTLOADER_LIBS += -Wl,--end-group
618618

esp32/esp32.custom_common.ld

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,15 @@ SECTIONS
8080
*(.iram1 .iram1.*)
8181
*freertos/*(.literal .text .literal.* .text.*)
8282
*esp32/panic.o(.literal .text .literal.* .text.*)
83+
*esp32/core_dump.o(.literal .text .literal.* .text.*)
8384
*libphy.a:(.literal .text .literal.* .text.*)
8485
*librtc.a:(.literal .text .literal.* .text.*)
85-
*libpp.a:(.literal .text .literal.* .text.*)
86+
*librtc_clk.a:(.literal .text .literal.* .text.*)
87+
*libpp.a:pp.o(.literal .text .literal.* .text.*)
88+
*libpp.a:lmac.o(.literal .text .literal.* .text.*)
89+
*libpp.a:wdev.o(.literal .text .literal.* .text.*)
90+
*libcore.a:ets_timer.o(.literal .text .literal.* .text.*)
91+
*libnet80211.a:ieee80211_misc.o(.literal .text .literal.* .text.*)
8692
*libhal.a:(.literal .text .literal.* .text.*)
8793
*libcoexist.a:(.literal .text .literal.* .text.*)
8894
_iram_text_end = ABSOLUTE(.);

esp32/sdkconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#define CONFIG_ESP32_DEBUG_OCDAWARE 1
1515
#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 0
1616
#define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
17-
#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25
17+
#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 16
18+
#define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
1819

1920
#define CONFIG_INT_WDT 1
2021
#define CONFIG_INT_WDT_TIMEOUT_MS 300

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy