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

Commit d7049f3

Browse files
MrSurlydpgeorge
authored andcommitted
esp32: Update to latest ESP IDF.
The -Wno-array-bounds for dport_access.o is needed to suppress warnings when CONFIG_FREERTOS_UNICORE is enabled.
1 parent 1365f7f commit d7049f3

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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 := f73c6f875cc564fa6c9962be71eac4dbdc56aa63
32+
ESPIDF_SUPHASH := 1e0710f1b24429a316c9c34732aa17bd3f189421
3333
ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
3434
ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
3535
$(info ** WARNING **)
@@ -204,15 +204,18 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
204204
gpio.o \
205205
timer.o \
206206
spi_master.o \
207+
spi_common.o \
207208
rtc_module.o \
208209
)
209210

211+
$(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
210212
ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
211213
app_trace.o \
212214
panic.o \
213215
event_default_handlers.o \
214216
task_wdt.o \
215217
cache_err_int.o \
218+
clk.o \
216219
core_dump.o \
217220
cpu_start.o \
218221
gdbstub.o \
@@ -222,7 +225,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
222225
ipc.o \
223226
int_wdt.o \
224227
event_loop.o \
225-
cpu_freq.o \
226228
hwcrypto/sha.o \
227229
hwcrypto/aes.o \
228230
lib_printf.o \
@@ -231,6 +233,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
231233
hw_random.o \
232234
phy_init.o \
233235
intr_alloc.o \
236+
dport_access.o \
234237
)
235238

236239
ESPIDF_SOC_O = $(addprefix $(ESPCOMP)/soc/,\
@@ -633,6 +636,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
633636
log/log.o \
634637
spi_flash/spi_flash_rom_patch.o \
635638
soc/esp32/rtc_clk.o \
639+
soc/esp32/rtc_time.o \
636640
micro-ecc/micro-ecc/uECC.o \
637641
bootloader/src/main/bootloader_start.o \
638642
)

esp32/sdkconfig.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
#define CONFIG_APP_OFFSET 0x10000
66

77
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
8+
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
9+
#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
10+
11+
#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
812

913
#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
1014
#define CONFIG_ESP32_PHY_AUTO_INIT 1
@@ -25,6 +29,10 @@
2529
#define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
2630
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
2731
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
32+
#define CONFIG_ESP32_XTAL_FREQ_AUTO 1
33+
#define CONFIG_ESP32_XTAL_FREQ 0
34+
#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
35+
2836
#define CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1
2937
#define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
3038

0 commit comments

Comments
 (0)