esp32: Update to the latest ESP IDF.
This update requires a new ESP32 toolchain: 1.22.0-80-g6c4433a-5.2.0.
This commit is contained in:
Damien George
parent
fe3e17b026
commit
c49a73ab0e
|
|
@ -21,7 +21,7 @@ FLASH_FREQ ?= 40m
|
|||
FLASH_SIZE ?= 4MB
|
||||
CROSS_COMPILE ?= xtensa-esp32-elf-
|
||||
|
||||
ESPIDF_SUPHASH := 2c95a77cf93781f296883d5dbafcdc18e4389656
|
||||
ESPIDF_SUPHASH := 3ede9f011b50999b0560683f9419538c066dd09e
|
||||
|
||||
# paths to ESP IDF and its components
|
||||
ifeq ($(ESPIDF),)
|
||||
|
|
@ -90,6 +90,7 @@ INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/include
|
|||
INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/port/include
|
||||
INC_ESPCOMP += -I$(ESPCOMP)/ethernet/include
|
||||
INC_ESPCOMP += -I$(ESPCOMP)/app_trace/include
|
||||
INC_ESPCOMP += -I$(ESPCOMP)/app_update/include
|
||||
|
||||
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
|
||||
CFLAGS = $(CFLAGS_BASE) $(INC) $(INC_ESPCOMP)
|
||||
|
|
@ -336,9 +337,9 @@ ESPIDF_VFS_O = $(addprefix $(ESPCOMP)/vfs/,\
|
|||
vfs.o \
|
||||
)
|
||||
|
||||
ESPIDF_JSON_O = $(addprefix $(ESPCOMP)/json/,\
|
||||
library/cJSON.o \
|
||||
port/cJSON_Utils.o \
|
||||
ESPIDF_JSON_O = $(addprefix $(ESPCOMP)/json/cJSON/,\
|
||||
cJSON.o \
|
||||
cJSON_Utils.o \
|
||||
)
|
||||
|
||||
ESPIDF_LOG_O = $(addprefix $(ESPCOMP)/log/,\
|
||||
|
|
@ -358,6 +359,10 @@ ESPIDF_APP_TRACE_O = $(addprefix $(ESPCOMP)/app_trace/,\
|
|||
app_trace.o \
|
||||
)
|
||||
|
||||
ESPIDF_APP_UPDATE_O = $(addprefix $(ESPCOMP)/app_update/,\
|
||||
esp_ota_ops.o \
|
||||
)
|
||||
|
||||
ESPIDF_NEWLIB_O = $(addprefix $(ESPCOMP)/newlib/,\
|
||||
time.o \
|
||||
syscalls.o \
|
||||
|
|
@ -594,6 +599,7 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_MBEDTLS_O))
|
|||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_XTENSA_DEBUG_MODULE_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_TCPIP_ADAPTER_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_TRACE_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_UPDATE_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NGHTTP_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_NVS_FLASH_O))
|
||||
OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_OPENSSL_O))
|
||||
|
|
@ -671,6 +677,7 @@ $(BUILD)/%.o: %.cpp
|
|||
|
||||
$(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
|
||||
BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
|
||||
bootloader_support/src/bootloader_clock.o \
|
||||
bootloader_support/src/bootloader_flash.o \
|
||||
bootloader_support/src/bootloader_random.o \
|
||||
bootloader_support/src/bootloader_sha.o \
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ SECTIONS
|
|||
*esp32/core_dump.o(.literal .text .literal.* .text.*)
|
||||
*app_trace/*(.literal .text .literal.* .text.*)
|
||||
*xtensa-debug-module/eri.o(.literal .text .literal.* .text.*)
|
||||
*libphy.a:(.literal .text .literal.* .text.*)
|
||||
*librtc.a:(.literal .text .literal.* .text.*)
|
||||
*libsoc.a:(.literal .text .literal.* .text.*)
|
||||
*libhal.a:(.literal .text .literal.* .text.*)
|
||||
|
|
@ -196,6 +195,13 @@ SECTIONS
|
|||
*(.gnu.linkonce.lit4.*)
|
||||
_lit4_end = ABSOLUTE(.);
|
||||
. = ALIGN(4);
|
||||
_thread_local_start = ABSOLUTE(.);
|
||||
*(.tdata)
|
||||
*(.tdata.*)
|
||||
*(.tbss)
|
||||
*(.tbss.*)
|
||||
_thread_local_end = ABSOLUTE(.);
|
||||
. = ALIGN(4);
|
||||
} >drom0_0_seg
|
||||
|
||||
.flash.text :
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
|
|||
|
||||
switch (id) {
|
||||
case 0:
|
||||
esp_task_wdt_feed();
|
||||
esp_task_wdt_add(NULL);
|
||||
return &wdt_default;
|
||||
default:
|
||||
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
|
|||
|
||||
STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
|
||||
(void)self_in;
|
||||
esp_task_wdt_feed();
|
||||
esp_task_wdt_reset();
|
||||
return mp_const_none;
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
#define MP_TASK_PRIORITY (ESP_TASK_PRIO_MIN + 1)
|
||||
#define MP_TASK_STACK_SIZE (16 * 1024)
|
||||
#define MP_TASK_STACK_LEN (MP_TASK_STACK_SIZE / sizeof(StackType_t))
|
||||
#define MP_TASK_HEAP_SIZE (96 * 1024)
|
||||
#define MP_TASK_HEAP_SIZE (92 * 1024)
|
||||
|
||||
STATIC StaticTask_t mp_task_tcb;
|
||||
STATIC StackType_t mp_task_stack[MP_TASK_STACK_LEN] __attribute__((aligned (8)));
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
/* Start bootloader config */
|
||||
#define CONFIG_FLASHMODE_DIO 1
|
||||
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
|
||||
/* End bootloader config */
|
||||
|
||||
#define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
|
||||
#define CONFIG_BT_RESERVE_DRAM 0x0
|
||||
#define CONFIG_ULP_COPROC_RESERVE_MEM 0
|
||||
|
|
@ -104,6 +109,9 @@
|
|||
#define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
|
||||
#define CONFIG_LWIP_DHCP_DOES_ARP_CHECK 1
|
||||
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
|
||||
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
|
||||
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
|
||||
#define CONFIG_LWIP_MAX_ACTIVE_TCP 16
|
||||
#define CONFIG_LWIP_MAX_SOCKETS 8
|
||||
#define CONFIG_LWIP_SO_REUSE 1
|
||||
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue