Skip to content

Commit 2923671

Browse files
dpgeorgedpgeorge
committed
esp32/Makefile: Update to latest ESP IDF version.
1 parent 478410b commit 2923671

1 file changed

Lines changed: 74 additions & 72 deletions

File tree

‎ports/esp32/Makefile‎

Lines changed: 74 additions & 72 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 := a2556229aa6f55b16b171e3325ee9ab1943e8552
24+
ESPIDF_SUPHASH := 1f7b41e206646417adc572da928175d33c986bd3
2525

2626
# paths to ESP IDF and its components
2727
ifeq ($(ESPIDF),)
@@ -80,7 +80,7 @@ INC_ESPCOMP += -I$(ESPCOMP)/tcpip_adapter/include
8080
INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/lwip
8181
INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/lwip/port
8282
INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/lwip/posix
83-
INC_ESPCOMP += -I$(ESPCOMP)/mbedtls/include
83+
INC_ESPCOMP += -I$(ESPCOMP)/mbedtls/mbedtls/include
8484
INC_ESPCOMP += -I$(ESPCOMP)/mbedtls/port/include
8585
INC_ESPCOMP += -I$(ESPCOMP)/spi_flash/include
8686
INC_ESPCOMP += -I$(ESPCOMP)/ulp/include
@@ -369,6 +369,7 @@ ESPIDF_APP_UPDATE_O = $(addprefix $(ESPCOMP)/app_update/,\
369369

370370
ESPIDF_NEWLIB_O = $(addprefix $(ESPCOMP)/newlib/,\
371371
time.o \
372+
select.o \
372373
syscalls.o \
373374
syscall_table.o \
374375
reent_init.o \
@@ -482,83 +483,84 @@ ESPIDF_LWIP_O = $(addprefix $(ESPCOMP)/lwip/,\
482483
)
483484

484485
ESPIDF_MBEDTLS_O = $(addprefix $(ESPCOMP)/mbedtls/,\
485-
library/entropy.o \
486-
library/pkcs12.o \
487-
library/ccm.o \
488-
library/pk.o \
489-
library/sha1.o \
490-
library/x509_csr.o \
491-
library/ssl_cli.o \
492-
library/ecp.o \
493-
library/blowfish.o \
494-
library/x509.o \
495-
library/ecp_curves.o \
496-
library/error.o \
497-
library/ssl_ticket.o \
498-
library/entropy_poll.o \
499-
library/cipher.o \
500-
library/version_features.o \
501-
library/ripemd160.o \
502-
library/rsa.o \
503-
library/md.o \
504-
library/md_wrap.o \
505-
library/sha256.o \
506-
library/dhm.o \
507-
library/ssl_cache.o \
508-
library/pkwrite.o \
509-
library/base64.o \
510-
library/asn1parse.o \
511-
library/ssl_tls.o \
512-
library/hmac_drbg.o \
513-
library/pem.o \
514-
library/version.o \
515-
library/gcm.o \
516-
library/memory_buffer_alloc.o \
517-
library/md2.o \
518-
library/ecdsa.o \
519-
library/ssl_srv.o \
520-
library/x509_crt.o \
521-
library/ecdh.o \
522-
library/asn1write.o \
523-
library/md4.o \
524-
library/debug.o \
525-
library/x509_create.o \
526-
library/ecjpake.o \
527-
library/oid.o \
528-
library/md5.o \
529-
library/ssl_ciphersuites.o \
530-
library/sha512.o \
531-
library/xtea.o \
532-
library/aes.o \
533-
library/cipher_wrap.o \
534-
library/arc4.o \
535-
library/bignum.o \
536-
library/pkparse.o \
537-
library/padlock.o \
538-
library/threading.o \
539-
library/x509_crl.o \
540-
library/pkcs11.o \
541-
library/aesni.o \
542-
library/timing.o \
543-
library/certs.o \
544-
library/pkcs5.o \
545-
library/ssl_cookie.o \
546-
library/camellia.o \
547-
library/havege.o \
548-
library/des.o \
549-
library/x509write_csr.o \
550-
library/platform.o \
551-
library/ctr_drbg.o \
552-
library/x509write_crt.o \
553-
library/pk_wrap.o \
486+
mbedtls/library/entropy.o \
487+
mbedtls/library/pkcs12.o \
488+
mbedtls/library/ccm.o \
489+
mbedtls/library/pk.o \
490+
mbedtls/library/sha1.o \
491+
mbedtls/library/x509_csr.o \
492+
mbedtls/library/ssl_cli.o \
493+
mbedtls/library/ecp.o \
494+
mbedtls/library/blowfish.o \
495+
mbedtls/library/x509.o \
496+
mbedtls/library/ecp_curves.o \
497+
mbedtls/library/error.o \
498+
mbedtls/library/ssl_ticket.o \
499+
mbedtls/library/entropy_poll.o \
500+
mbedtls/library/cipher.o \
501+
mbedtls/library/version_features.o \
502+
mbedtls/library/ripemd160.o \
503+
mbedtls/library/rsa.o \
504+
mbedtls/library/rsa_internal.o \
505+
mbedtls/library/md.o \
506+
mbedtls/library/md_wrap.o \
507+
mbedtls/library/sha256.o \
508+
mbedtls/library/dhm.o \
509+
mbedtls/library/ssl_cache.o \
510+
mbedtls/library/pkwrite.o \
511+
mbedtls/library/base64.o \
512+
mbedtls/library/asn1parse.o \
513+
mbedtls/library/ssl_tls.o \
514+
mbedtls/library/hmac_drbg.o \
515+
mbedtls/library/pem.o \
516+
mbedtls/library/version.o \
517+
mbedtls/library/gcm.o \
518+
mbedtls/library/memory_buffer_alloc.o \
519+
mbedtls/library/md2.o \
520+
mbedtls/library/ecdsa.o \
521+
mbedtls/library/ssl_srv.o \
522+
mbedtls/library/x509_crt.o \
523+
mbedtls/library/ecdh.o \
524+
mbedtls/library/asn1write.o \
525+
mbedtls/library/md4.o \
526+
mbedtls/library/debug.o \
527+
mbedtls/library/x509_create.o \
528+
mbedtls/library/ecjpake.o \
529+
mbedtls/library/oid.o \
530+
mbedtls/library/md5.o \
531+
mbedtls/library/ssl_ciphersuites.o \
532+
mbedtls/library/sha512.o \
533+
mbedtls/library/xtea.o \
534+
mbedtls/library/aes.o \
535+
mbedtls/library/cipher_wrap.o \
536+
mbedtls/library/arc4.o \
537+
mbedtls/library/bignum.o \
538+
mbedtls/library/pkparse.o \
539+
mbedtls/library/padlock.o \
540+
mbedtls/library/threading.o \
541+
mbedtls/library/x509_crl.o \
542+
mbedtls/library/pkcs11.o \
543+
mbedtls/library/aesni.o \
544+
mbedtls/library/timing.o \
545+
mbedtls/library/certs.o \
546+
mbedtls/library/pkcs5.o \
547+
mbedtls/library/ssl_cookie.o \
548+
mbedtls/library/camellia.o \
549+
mbedtls/library/havege.o \
550+
mbedtls/library/des.o \
551+
mbedtls/library/x509write_csr.o \
552+
mbedtls/library/platform.o \
553+
mbedtls/library/ctr_drbg.o \
554+
mbedtls/library/x509write_crt.o \
555+
mbedtls/library/pk_wrap.o \
554556
port/esp_bignum.o \
555557
port/esp_hardware.o \
556558
port/esp_sha1.o \
557559
port/esp_sha256.o \
558560
port/esp_sha512.o \
559561
)
560562

561-
$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DEMBEDDED_SUPP -D__ets__ -Wno-strict-aliasing
563+
$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DEMBEDDED_SUPP -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_MSCHAPv2 -DEAP_TTLS -DEAP_TLS -DEAP_PEAP -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -D__ets__ -Wno-strict-aliasing
562564
ESPIDF_WPA_SUPPLICANT_O = $(addprefix $(ESPCOMP)/wpa_supplicant/,\
563565
src/crypto/aes-internal-enc.o \
564566
src/crypto/sha256-internal.o \

0 commit comments

Comments
 (0)