Skip to content

Commit c49a73a

Browse files
dpgeorgedpgeorge
committed
esp32: Update to the latest ESP IDF.
This update requires a new ESP32 toolchain: 1.22.0-80-g6c4433a-5.2.0.
1 parent fe3e17b commit c49a73a

5 files changed

Lines changed: 29 additions & 8 deletions

File tree

‎ports/esp32/Makefile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FLASH_FREQ ?= 40m
2121
FLASH_SIZE ?= 4MB
2222
CROSS_COMPILE ?= xtensa-esp32-elf-
2323

24-
ESPIDF_SUPHASH := 2c95a77cf93781f296883d5dbafcdc18e4389656
24+
ESPIDF_SUPHASH := 3ede9f011b50999b0560683f9419538c066dd09e
2525

2626
# paths to ESP IDF and its components
2727
ifeq ($(ESPIDF),)
@@ -90,6 +90,7 @@ INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/include
9090
INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/port/include
9191
INC_ESPCOMP += -I$(ESPCOMP)/ethernet/include
9292
INC_ESPCOMP += -I$(ESPCOMP)/app_trace/include
93+
INC_ESPCOMP += -I$(ESPCOMP)/app_update/include
9394

9495
CFLAGS_BASE = -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
9596
CFLAGS = $(CFLAGS_BASE) $(INC) $(INC_ESPCOMP)
@@ -336,9 +337,9 @@ ESPIDF_VFS_O = $(addprefix $(ESPCOMP)/vfs/,\
336337
vfs.o \
337338
)
338339

339-
ESPIDF_JSON_O = $(addprefix $(ESPCOMP)/json/,\
340-
library/cJSON.o \
341-
port/cJSON_Utils.o \
340+
ESPIDF_JSON_O = $(addprefix $(ESPCOMP)/json/cJSON/,\
341+
cJSON.o \
342+
cJSON_Utils.o \
342343
)
343344

344345
ESPIDF_LOG_O = $(addprefix $(ESPCOMP)/log/,\
@@ -358,6 +359,10 @@ ESPIDF_APP_TRACE_O = $(addprefix $(ESPCOMP)/app_trace/,\
358359
app_trace.o \
359360
)
360361

362+
ESPIDF_APP_UPDATE_O = $(addprefix $(ESPCOMP)/app_update/,\
363+
esp_ota_ops.o \
364+
)
365+
361366
ESPIDF_NEWLIB_O = $(addprefix $(ESPCOMP)/newlib/,\
362367
time.o \
363368
syscalls.o \
@@ -594,6 +599,7 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_MBEDTLS_O))
594599
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_XTENSA_DEBUG_MODULE_O))
595600
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_TCPIP_ADAPTER_O))
596601
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_TRACE_O))
602+
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_UPDATE_O))
597603
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NGHTTP_O))
598604
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NVS_FLASH_O))
599605
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_OPENSSL_O))
@@ -671,6 +677,7 @@ $(BUILD)/%.o: %.cpp
671677

672678
$(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/bootloader_support/include_priv -I$(ESPCOMP)/bootloader_support/include -I$(ESPCOMP)/micro-ecc/micro-ecc -I$(ESPCOMP)/esp32 -Wno-error=format
673679
BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
680+
bootloader_support/src/bootloader_clock.o \
674681
bootloader_support/src/bootloader_flash.o \
675682
bootloader_support/src/bootloader_random.o \
676683
bootloader_support/src/bootloader_sha.o \

‎ports/esp32/esp32.custom_common.ld‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ 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-
*libphy.a:(.literal .text .literal.* .text.*)
9392
*librtc.a:(.literal .text .literal.* .text.*)
9493
*libsoc.a:(.literal .text .literal.* .text.*)
9594
*libhal.a:(.literal .text .literal.* .text.*)
@@ -196,6 +195,13 @@ SECTIONS
196195
*(.gnu.linkonce.lit4.*)
197196
_lit4_end = ABSOLUTE(.);
198197
. = ALIGN(4);
198+
_thread_local_start = ABSOLUTE(.);
199+
*(.tdata)
200+
*(.tdata.*)
201+
*(.tbss)
202+
*(.tbss.*)
203+
_thread_local_end = ABSOLUTE(.);
204+
. = ALIGN(4);
199205
} >drom0_0_seg
200206

201207
.flash.text :

‎ports/esp32/machine_wdt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
5151

5252
switch (id) {
5353
case 0:
54-
esp_task_wdt_feed();
54+
esp_task_wdt_add(NULL);
5555
return &wdt_default;
5656
default:
5757
mp_raise_ValueError(NULL);
@@ -60,7 +60,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
6060

6161
STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
6262
(void)self_in;
63-
esp_task_wdt_feed();
63+
esp_task_wdt_reset();
6464
return mp_const_none;
6565
}
6666
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);

‎ports/esp32/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define MP_TASK_PRIORITY (ESP_TASK_PRIO_MIN + 1)
5454
#define MP_TASK_STACK_SIZE (16 * 1024)
5555
#define MP_TASK_STACK_LEN (MP_TASK_STACK_SIZE / sizeof(StackType_t))
56-
#define MP_TASK_HEAP_SIZE (96 * 1024)
56+
#define MP_TASK_HEAP_SIZE (92 * 1024)
5757

5858
STATIC StaticTask_t mp_task_tcb;
5959
STATIC StackType_t mp_task_stack[MP_TASK_STACK_LEN] __attribute__((aligned (8)));

‎ports/esp32/sdkconfig.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Start bootloader config */
2+
#define CONFIG_FLASHMODE_DIO 1
3+
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
4+
/* End bootloader config */
5+
16
#define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
27
#define CONFIG_BT_RESERVE_DRAM 0x0
38
#define CONFIG_ULP_COPROC_RESERVE_MEM 0
@@ -104,6 +109,9 @@
104109
#define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
105110
#define CONFIG_LWIP_DHCP_DOES_ARP_CHECK 1
106111
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
112+
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
113+
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
114+
#define CONFIG_LWIP_MAX_ACTIVE_TCP 16
107115
#define CONFIG_LWIP_MAX_SOCKETS 8
108116
#define CONFIG_LWIP_SO_REUSE 1
109117
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1

0 commit comments

Comments
 (0)