From 4365edb810aa0e54eb91d201eb5bf0436c86c4b3 Mon Sep 17 00:00:00 2001 From: IhorNehrutsa Date: Sun, 12 Nov 2023 20:49:07 +0200 Subject: [PATCH] esp32: Change minimum supported IDF version to v5.0.4. Also, IDF v5.1.2 is now supported, just not used by default. IDF v5.0.2 still builds but we cannot guarantee continued support for this version moving forward. Signed-off-by: IhorNehrutsa --- ports/esp32/README.md | 8 ++++---- ports/esp32/main_esp32/idf_component.yml | 2 +- ports/esp32/main_esp32c3/idf_component.yml | 2 +- ports/esp32/main_esp32s2/idf_component.yml | 2 +- ports/esp32/main_esp32s3/idf_component.yml | 2 +- tools/ci.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/esp32/README.md b/ports/esp32/README.md index 169de4073b..a7531b6eaa 100644 --- a/ports/esp32/README.md +++ b/ports/esp32/README.md @@ -28,7 +28,7 @@ manage the ESP32 microcontroller, as well as a way to manage the required build environment and toolchains needed to build the firmware. The ESP-IDF changes quickly and MicroPython only supports certain versions. -Currently MicroPython supports only v5.0.2. +Currently MicroPython supports v5.0.4, v5.1.2. To install the ESP-IDF the full instructions can be found at the [Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html#installation-step-by-step). @@ -46,10 +46,10 @@ The steps to take are summarised below. To check out a copy of the IDF use git clone: ```bash -$ git clone -b v5.0.2 --recursive https://github.com/espressif/esp-idf.git +$ git clone -b v5.0.4 --recursive https://github.com/espressif/esp-idf.git ``` -You can replace `v5.0.2` with any other supported version. +You can replace `v5.0.4` with any other supported version. (You don't need a full recursive clone; see the `ci_esp32_setup` function in `tools/ci.sh` in this repository for more detailed set-up commands.) @@ -58,7 +58,7 @@ MicroPython and update the submodules using: ```bash $ cd esp-idf -$ git checkout v5.0.2 +$ git checkout v5.0.4 $ git submodule update --init --recursive ``` diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml index 8be21ed2fb..5dabbc00ba 100644 --- a/ports/esp32/main_esp32/idf_component.yml +++ b/ports/esp32/main_esp32/idf_component.yml @@ -2,4 +2,4 @@ dependencies: espressif/mdns: "~1.1.0" idf: - version: ">=5.0.2" + version: ">=5.0.4" diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml index 8be21ed2fb..5dabbc00ba 100644 --- a/ports/esp32/main_esp32c3/idf_component.yml +++ b/ports/esp32/main_esp32c3/idf_component.yml @@ -2,4 +2,4 @@ dependencies: espressif/mdns: "~1.1.0" idf: - version: ">=5.0.2" + version: ">=5.0.4" diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml index 69e27bf8b5..05ab2f29a8 100644 --- a/ports/esp32/main_esp32s2/idf_component.yml +++ b/ports/esp32/main_esp32s2/idf_component.yml @@ -3,4 +3,4 @@ dependencies: espressif/mdns: "~1.1.0" espressif/esp_tinyusb: "~1.0.0" idf: - version: ">=5.0.2" + version: ">=5.0.4" diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml index 69e27bf8b5..05ab2f29a8 100644 --- a/ports/esp32/main_esp32s3/idf_component.yml +++ b/ports/esp32/main_esp32s3/idf_component.yml @@ -3,4 +3,4 @@ dependencies: espressif/mdns: "~1.1.0" espressif/esp_tinyusb: "~1.0.0" idf: - version: ">=5.0.2" + version: ">=5.0.4" diff --git a/tools/ci.sh b/tools/ci.sh index b71862273d..d3ae411582 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -119,7 +119,7 @@ function ci_cc3200_build { # ports/esp32 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch) -IDF_VER=v5.0.2 +IDF_VER=v5.0.4 export IDF_CCACHE_ENABLE=1