diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2020-04-01 15:16:03 +1100 |
|---|---|---|
| committer | Jim Mussared <jim.mussared@gmail.com> | 2020-06-09 16:15:47 +1000 |
| commit | 8e8dcdd34b39be58c4d9b64ee23ad40acb2a6b1d (patch) | |
| tree | d43cba7e0483c221e14388c477a55faeac4292cf | |
| parent | 51fd6c97773a7e0d76bb61e220b35b98f392e27e (diff) | |
| download | micropython-8e8dcdd34b39be58c4d9b64ee23ad40acb2a6b1d.tar.gz micropython-8e8dcdd34b39be58c4d9b64ee23ad40acb2a6b1d.zip | |
esp32: Update IDF v4.0 supported hash to v4.0.1.
The main fix relevant to MicroPython is https://github.com/espressif/esp-idf/issues/4196
Release notes here
https://github.com/espressif/esp-idf/releases/tag/v4.0.1
| -rw-r--r-- | ports/esp32/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index bd89e8b0c5..0f6a1969a6 100644 --- a/ports/esp32/Makefile +++ b/ports/esp32/Makefile @@ -54,9 +54,9 @@ SDKCONFIG_COMBINED = $(BUILD)/sdkconfig.combined SDKCONFIG_H = $(BUILD)/sdkconfig.h # The git hash of the currently supported ESP IDF version. -# These correspond to v3.3.2 and v4.0. +# These correspond to v3.3.2 and v4.0.1. ESPIDF_SUPHASH_V3 := 9e70825d1e1cbf7988cf36981774300066580ea7 -ESPIDF_SUPHASH_V4 := 463a9d8b7f9af8205222b80707f9bdbba7c530e1 +ESPIDF_SUPHASH_V4 := 4c81978a3e2220674a432a588292a4c860eef27b define print_supported_git_hash $(info Supported git hash (v3.3): $(ESPIDF_SUPHASH_V3)) @@ -515,7 +515,7 @@ ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o,\ ESPIDF_MDNS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/mdns/*.c)) ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4)) -$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -D__ets__ -Wno-strict-aliasing -I$(ESPCOMP)/wpa_supplicant/src -Wno-implicit-function-declaration +$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DCONFIG_WPA3_SAE -DCONFIG_IEEE80211W -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -D__ets__ -Wno-strict-aliasing -I$(ESPCOMP)/wpa_supplicant/src -Wno-implicit-function-declaration else $(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 -DALLOW_EVEN_MOD -D__ets__ -Wno-strict-aliasing endif @@ -555,6 +555,7 @@ ESPIDF_BT_NIMBLE_O = $(patsubst %.c,%.o,\ $(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/src/*.c) \ $(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/nimble/src/*.c) \ $(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/npl/freertos/src/*.c) \ + $(wildcard $(ESPCOMP)/bt/host/nimble/port/src/*.c) \ ) endif |