Skip to content

Commit 973cd4b

Browse files
committed
Upgrade ESP-IDF v5.3.2 to v5.4.1.
1 parent 8f7496c commit 973cd4b

File tree

5 files changed

+8
-31
lines changed

5 files changed

+8
-31
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145-
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.3.2
145+
url = https://github.com/eightycc/esp-idf.git
146+
branch = circuitpython-v5.4.1
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/adafruit/esp-protocols.git

ports/espressif/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ INC += \
8383
-isystem esp-idf/components/esp_psram/include \
8484
-isystem esp-idf/components/esp_ringbuf/include \
8585
-isystem esp-idf/components/esp_rom/include \
86+
-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include \
87+
-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include/$(IDF_TARGET) \
8688
-isystem esp-idf/components/esp_system/include \
8789
-isystem esp-idf/components/esp_timer/include \
8890
-isystem esp-idf/components/esp_wifi/include \
@@ -115,6 +117,7 @@ INC += \
115117
-isystem esp-idf/components/sdmmc/include \
116118
-isystem esp-idf/components/soc/include \
117119
-isystem esp-idf/components/soc/$(IDF_TARGET)/include \
120+
-isystem esp-idf/components/soc/$(IDF_TARGET)/register \
118121
-isystem esp-idf/components/spi_flash/include \
119122
-isystem esp-idf/components/usb/include \
120123
-isystem esp-idf/components/ulp/ulp_fsm/include \

ports/espressif/esp-idf

Submodule esp-idf updated 6989 files

ports/espressif/mphalport.c

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,7 @@
88
#include "py/mphal.h"
99
#include "supervisor/cpu.h"
1010

11-
#if defined(CONFIG_IDF_TARGET_ESP32)
12-
#include "components/esp_rom/include/esp32/rom/ets_sys.h"
13-
#elif defined(CONFIG_IDF_TARGET_ESP32C2)
14-
#include "components/esp_rom/include/esp32c2/rom/ets_sys.h"
15-
#elif defined(CONFIG_IDF_TARGET_ESP32P4)
16-
#include "components/esp_rom/include/esp32p4/rom/ets_sys.h"
17-
#elif defined(CONFIG_IDF_TARGET_ESP32C3)
18-
#include "components/esp_rom/include/esp32c3/rom/ets_sys.h"
19-
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
20-
#include "components/esp_rom/include/esp32c6/rom/ets_sys.h"
21-
#elif defined(CONFIG_IDF_TARGET_ESP32H2)
22-
#include "components/esp_rom/include/esp32h2/rom/ets_sys.h"
23-
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
24-
#include "components/esp_rom/include/esp32s2/rom/ets_sys.h"
25-
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
26-
#include "components/esp_rom/include/esp32s3/rom/ets_sys.h"
27-
#else
28-
#error Unknown CONFIG_IDF_TARGET_xxx
29-
#endif
11+
#include "rom/ets_sys.h"
3012

3113
#include "esp_attr.h"
3214

ports/espressif/supervisor/usb.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,7 @@
2020
#include "driver/gpio.h"
2121
#include "esp_private/periph_ctrl.h"
2222

23-
#if defined(CONFIG_IDF_TARGET_ESP32C3)
24-
#include "components/esp_rom/include/esp32c3/rom/gpio.h"
25-
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
26-
#include "components/esp_rom/include/esp32c6/rom/gpio.h"
27-
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
28-
#include "components/esp_rom/include/esp32s2/rom/gpio.h"
29-
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
30-
#include "components/esp_rom/include/esp32s3/rom/gpio.h"
31-
#endif
23+
#include "rom/gpio.h"
3224

3325
#include "freertos/FreeRTOS.h"
3426
#include "freertos/task.h"

0 commit comments

Comments
 (0)