@@ -369,6 +369,7 @@ EXTMOD_SRC_C += $(addprefix extmod/,\
369
369
)
370
370
371
371
LIB_SRC_C = $(addprefix lib/,\
372
+ mbedtls_errors/mp_mbedtls_errors.c \
372
373
mp-readline/readline.c \
373
374
netutils/netutils.c \
374
375
timeutils/timeutils.c \
@@ -513,11 +514,12 @@ ESPIDF_LWIP_O = $(patsubst %.c,%.o,\
513
514
$(wildcard $(ESPCOMP ) /lwip/port/esp32/* /* .c) \
514
515
)
515
516
516
- ESPIDF_MBEDTLS_O = $(patsubst % .c,% .o,\
517
+ # Mbedtls source files, exclude error.c in favor of lib/mbedtls_errors/mp_mbedtls_errors.c
518
+ ESPIDF_MBEDTLS_O = $(patsubst % .c,% .o, $(filter-out % /error.c,\
517
519
$(wildcard $(ESPCOMP ) /mbedtls/mbedtls/library/* .c) \
518
520
$(wildcard $(ESPCOMP ) /mbedtls/port/* .c) \
519
521
$(wildcard $(ESPCOMP ) /mbedtls/port/esp32/* .c) \
520
- )
522
+ ) )
521
523
522
524
ESPIDF_MDNS_O = $(patsubst % .c,% .o,$(wildcard $(ESPCOMP ) /mdns/* .c) )
523
525
@@ -607,10 +609,10 @@ endif
607
609
endif
608
610
609
611
ESP32_CAM_O = $(patsubst % .c,% .o,\
610
- $(wildcard $(ESPCOMP ) /esp32-camera/driver/* .c) \
611
- $(wildcard $(ESPCOMP ) /esp32-camera/sensors/* .c) \
612
- $(wildcard $(ESPCOMP ) /esp32-camera/conversions/* .c) \
613
- )
612
+ $(wildcard $(ESPCOMP ) /esp32-camera/driver/* .c) \
613
+ $(wildcard $(ESPCOMP ) /esp32-camera/sensors/* .c) \
614
+ $(wildcard $(ESPCOMP ) /esp32-camera/conversions/* .c) \
615
+ )
614
616
615
617
OBJ_ESPIDF =
616
618
LIB_ESPIDF =
@@ -654,7 +656,6 @@ $(eval $(call gen_espidf_lib_rule,sdmmc,$(ESPIDF_SDMMC_O)))
654
656
$(eval $(call gen_espidf_lib_rule,bt_nimble,$(ESPIDF_BT_NIMBLE_O)))
655
657
$(eval $(call gen_espidf_lib_rule,esp32_cam,$(ESP32_CAM_O)))
656
658
657
-
658
659
ifeq ($(ESPIDF_CURHASH ) ,$(ESPIDF_SUPHASH_V4 ) )
659
660
$(eval $(call gen_espidf_lib_rule,esp_common,$(ESPIDF_ESP_COMMON_O)))
660
661
$(eval $(call gen_espidf_lib_rule,esp_event,$(ESPIDF_ESP_EVENT_O)))
0 commit comments