Skip to content

Commit 45b8f76

Browse files
eightycceightycc
committed
ESP-IDF 5.4.1 update: Add esp_security component, fixup flash spi clock speed settings.
1 parent 94f1ec6 commit 45b8f76

File tree

7 files changed

+3
-67
lines changed

7 files changed

+3
-67
lines changed

‎ports/espressif/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ INC += \
8585
-isystem esp-idf/components/esp_rom/include \
8686
-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include \
8787
-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include/$(IDF_TARGET) \
88+
-isystem esp-idf/components/esp_security/include \
8889
-isystem esp-idf/components/esp_system/include \
8990
-isystem esp-idf/components/esp_timer/include \
9091
-isystem esp-idf/components/esp_wifi/include \
@@ -597,7 +598,7 @@ endif
597598

598599
ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
599600
ifneq ($(CIRCUITPY_WIFI),0)
600-
ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
601+
ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp_security esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
601602
endif
602603
ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
603604
BLE_IMPL_esp32 := esp32

‎ports/espressif/esp-idf

‎ports/espressif/esp-idf-config/sdkconfig-flash-120m.defaults

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
2-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
3-
# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
4-
# CONFIG_ESPTOOLPY_FLASHFREQ_60M is not set
5-
# CONFIG_ESPTOOLPY_FLASHFREQ_48M is not set
6-
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
7-
# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
8-
# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
9-
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
10-
# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
11-
# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
12-
# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
13-
# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
14-
CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y
152
CONFIG_SPI_FLASH_UNDER_HIGH_FREQ=y

‎ports/espressif/esp-idf-config/sdkconfig-flash-40m.defaults

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
2-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
3-
# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
4-
# CONFIG_ESPTOOLPY_FLASHFREQ_60M is not set
5-
# CONFIG_ESPTOOLPY_FLASHFREQ_48M is not set
61
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
7-
# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
8-
# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
9-
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
10-
# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
11-
# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
12-
# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
13-
# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
14-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT is not set

‎ports/espressif/esp-idf-config/sdkconfig-flash-48m.defaults

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
2-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
3-
# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
4-
# CONFIG_ESPTOOLPY_FLASHFREQ_60M is not set
51
CONFIG_ESPTOOLPY_FLASHFREQ_48M=y
6-
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
7-
# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
8-
# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
9-
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
10-
# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
11-
# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
12-
# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
13-
# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
14-
CONFIG_ESPTOOLPY_FLASHFREQ_48M_DEFAULT=y

‎ports/espressif/esp-idf-config/sdkconfig-flash-60m.defaults

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
2-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
3-
# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
41
CONFIG_ESPTOOLPY_FLASHFREQ_60M=y
5-
# CONFIG_ESPTOOLPY_FLASHFREQ_48M is not set
6-
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
7-
# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
8-
# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
9-
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
10-
# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
11-
# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
12-
# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
13-
# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
14-
# CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT is not set

‎ports/espressif/esp-idf-config/sdkconfig-flash-80m.defaults

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
21
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
3-
# CONFIG_ESPTOOLPY_FLASHFREQ_64M is not set
4-
# CONFIG_ESPTOOLPY_FLASHFREQ_60M is not set
5-
# CONFIG_ESPTOOLPY_FLASHFREQ_48M is not set
6-
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
7-
# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set
8-
# CONFIG_ESPTOOLPY_FLASHFREQ_30M is not set
9-
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
10-
# CONFIG_ESPTOOLPY_FLASHFREQ_24M is not set
11-
# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
12-
# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set
13-
# CONFIG_ESPTOOLPY_FLASHFREQ_15M is not set
14-
CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y

0 commit comments

Comments
 (0)