Skip to content

Commit 602f1f6

Browse files
me-no-devJason2866pre-commit-ci-lite[bot]
authored
IDF master (#11342)
* fix(ci): ESP32-P4 hosted compile fail (#11341) * fix(ci): Update changes for P4 and C5 builds with latest IDF * IDF master aaebc374 * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: Jason2866 <[email protected]> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent b115ace commit 602f1f6

File tree

5 files changed

+81
-70
lines changed

5 files changed

+81
-70
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hi
362362
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
363363
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
364364
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
365-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2") # Sadly only this works
365+
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2" OR IDF_TARGET STREQUAL "esp32c5") # Sadly only this works
366366
list(APPEND requires openthread)
367367
endif()
368368
endif()

‎cores/esp32/chip-debug-report.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ static void printPkgVersion(void) {
6868
uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SYS_2_REG, EFUSE_PKG_VERSION);
6969
chip_report_printf("%lu", pkg_ver);
7070
#elif CONFIG_IDF_TARGET_ESP32C5
71-
uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SYS2_REG, EFUSE_PKG_VERSION);
71+
// ToDo: Update this line when EFUSE_PKG_VERSION is available again for ESP32-C5
72+
uint32_t pkg_ver = 0; //REG_GET_FIELD(EFUSE_RD_MAC_SYS2_REG, EFUSE_PKG_VERSION);
7273
chip_report_printf("%lu", pkg_ver);
7374
#else
7475
chip_report_printf("Unknown");
@@ -92,11 +93,11 @@ static void printChipInfo(void) {
9293
case CHIP_ESP32H2: chip_report_printf("ESP32-H2\n"); break;
9394
case CHIP_ESP32P4: chip_report_printf("ESP32-P4\n"); break;
9495
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
95-
case CHIP_ESP32C5: chip_report_printf("ESP32-C5\n"); break;
96+
case CHIP_ESP32C5: chip_report_printf("ESP32-C5\n"); break;
9697
case CHIP_ESP32C61: chip_report_printf("ESP32-C61\n"); break;
9798
case CHIP_ESP32H21: chip_report_printf("ESP32-H21\n"); break;
9899
#endif
99-
default: chip_report_printf("Unknown %d\n", info.model); break;
100+
default: chip_report_printf("Unknown %d\n", info.model); break;
100101
}
101102
printPkgVersion();
102103
chip_report_printf(" Revision : %.2f\n", (float)(info.revision) / 100.0);

‎idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ dependencies:
105105
rules:
106106
- if: "target in [esp32s3]"
107107
espressif/esp_hosted:
108-
version: "^0.0.25"
108+
version: "^2.0.0"
109109
rules:
110110
- if: "target == esp32p4"
111111
espressif/esp_wifi_remote:

‎libraries/WiFi/src/WiFiGeneric.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,23 @@ static bool wifiHostedInit() {
252252
if (!hosted_initialized) {
253253
hosted_initialized = true;
254254
struct esp_hosted_sdio_config conf = INIT_DEFAULT_HOST_SDIO_CONFIG();
255+
#ifdef BOARD_HAS_SDIO_ESP_HOSTED
256+
conf.pin_clk.pin = BOARD_SDIO_ESP_HOSTED_CLK;
257+
conf.pin_cmd.pin = BOARD_SDIO_ESP_HOSTED_CMD;
258+
conf.pin_d0.pin = BOARD_SDIO_ESP_HOSTED_D0;
259+
conf.pin_d1.pin = BOARD_SDIO_ESP_HOSTED_D1;
260+
conf.pin_d2.pin = BOARD_SDIO_ESP_HOSTED_D2;
261+
conf.pin_d3.pin = BOARD_SDIO_ESP_HOSTED_D3;
262+
conf.pin_reset.pin = BOARD_SDIO_ESP_HOSTED_RESET;
263+
#else
255264
conf.pin_clk.pin = CONFIG_ESP_SDIO_PIN_CLK;
256265
conf.pin_cmd.pin = CONFIG_ESP_SDIO_PIN_CMD;
257266
conf.pin_d0.pin = CONFIG_ESP_SDIO_PIN_D0;
258267
conf.pin_d1.pin = CONFIG_ESP_SDIO_PIN_D1;
259268
conf.pin_d2.pin = CONFIG_ESP_SDIO_PIN_D2;
260269
conf.pin_d3.pin = CONFIG_ESP_SDIO_PIN_D3;
261-
//conf.pin_rst.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE;
270+
conf.pin_reset.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE;
271+
#endif
262272
// esp_hosted_sdio_set_config() will fail on second attempt but here temporarily to not cause exception on reinit
263273
if (esp_hosted_sdio_set_config(&conf) != ESP_OK || esp_hosted_init() != ESP_OK) {
264274
log_e("esp_hosted_init failed!");

‎package/package_esp32_index.template.json

+64-64
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"packager": "esp32",
5353
"name": "esp32-arduino-libs",
54-
"version": "idf-master-38628f98-v1"
54+
"version": "idf-master-aaebc374-v1"
5555
},
5656
{
5757
"packager": "esp32",
@@ -76,7 +76,7 @@
7676
{
7777
"packager": "esp32",
7878
"name": "openocd-esp32",
79-
"version": "v0.12.0-esp32-20250226"
79+
"version": "v0.12.0-esp32-20250422"
8080
},
8181
{
8282
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-master-38628f98-v1",
107+
"version": "idf-master-aaebc374-v1",
108108
"systems": [
109109
{
110110
"host": "i686-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
113-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
114-
"size": "398323971"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
113+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
114+
"size": "404569749"
115115
},
116116
{
117117
"host": "x86_64-mingw32",
118-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
120-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
121-
"size": "398323971"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
120+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
121+
"size": "404569749"
122122
},
123123
{
124124
"host": "arm64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
127-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
128-
"size": "398323971"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
127+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
128+
"size": "404569749"
129129
},
130130
{
131131
"host": "x86_64-apple-darwin",
132-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
134-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
135-
"size": "398323971"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
134+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
135+
"size": "404569749"
136136
},
137137
{
138138
"host": "x86_64-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
141-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
142-
"size": "398323971"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
141+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
142+
"size": "404569749"
143143
},
144144
{
145145
"host": "i686-pc-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
148-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
149-
"size": "398323971"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
148+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
149+
"size": "404569749"
150150
},
151151
{
152152
"host": "aarch64-linux-gnu",
153-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
155-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
156-
"size": "398323971"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
155+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
156+
"size": "404569749"
157157
},
158158
{
159159
"host": "arm-linux-gnueabihf",
160-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
162-
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
163-
"size": "398323971"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
162+
"checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
163+
"size": "404569749"
164164
}
165165
]
166166
},
@@ -414,56 +414,56 @@
414414
},
415415
{
416416
"name": "openocd-esp32",
417-
"version": "v0.12.0-esp32-20250226",
417+
"version": "v0.12.0-esp32-20250422",
418418
"systems": [
419419
{
420420
"host": "x86_64-pc-linux-gnu",
421-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-amd64-0.12.0-esp32-20250226.tar.gz",
422-
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20250226.tar.gz",
423-
"checksum": "SHA-256:914c726342ba5828e53f41aa454f01f317c42d8e6772d3d874593a6960fc4729",
424-
"size": "2414924"
421+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-amd64-0.12.0-esp32-20250422.tar.gz",
422+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20250422.tar.gz",
423+
"checksum": "SHA-256:eb1fa9b21c65b45a2200af6dcc2914e32335d37b6dbbd181778dcc0dc025e70a",
424+
"size": "2445546"
425425
},
426426
{
427427
"host": "aarch64-linux-gnu",
428-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-arm64-0.12.0-esp32-20250226.tar.gz",
429-
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20250226.tar.gz",
430-
"checksum": "SHA-256:c44ee99a9209c0234dbbcec86339fd685f5c61a763b29c33eba590bf62db2296",
431-
"size": "2293923"
428+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-arm64-0.12.0-esp32-20250422.tar.gz",
429+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20250422.tar.gz",
430+
"checksum": "SHA-256:f70334a9b12a75b4d943e09fa5db30973037c39dbb54d6fa9f1a7118228b3d1c",
431+
"size": "2330926"
432432
},
433433
{
434434
"host": "arm-linux-gnueabihf",
435-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-armel-0.12.0-esp32-20250226.tar.gz",
436-
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20250226.tar.gz",
437-
"checksum": "SHA-256:21ab6af3cf05f9290f4d59f1f381d5094dd2755fc528d3d2feb9334348fc0d8d",
438-
"size": "2436071"
435+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-armel-0.12.0-esp32-20250422.tar.gz",
436+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20250422.tar.gz",
437+
"checksum": "SHA-256:4ac34d6fd1af86aeda87c8318732f8d691c300c285c7fd2f5037c432c63fbbb3",
438+
"size": "2470732"
439439
},
440440
{
441441
"host": "x86_64-apple-darwin",
442-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-0.12.0-esp32-20250226.tar.gz",
443-
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20250226.tar.gz",
444-
"checksum": "SHA-256:0b5751699e93b6d101381611c96216ddff8c7dfd16425c610993fa27993f9a0a",
445-
"size": "2525387"
442+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
443+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
444+
"checksum": "SHA-256:9186a7a06304c6d9201cbce4ee3c7099b393bf8d329cda17a68874f92308f6ce",
445+
"size": "2548730"
446446
},
447447
{
448448
"host": "arm64-apple-darwin",
449-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-arm64-0.12.0-esp32-20250226.tar.gz",
450-
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20250226.tar.gz",
451-
"checksum": "SHA-256:8bffbbb594b27a4971a3922792135f8c836fff26991f7f450094386920263531",
452-
"size": "2568843"
449+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-macos-arm64-0.12.0-esp32-20250422.tar.gz",
450+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20250422.tar.gz",
451+
"checksum": "SHA-256:2cc39318d52f393233ff1f777871aebe5b97b3fbad29556a238489263401b774",
452+
"size": "2593819"
453453
},
454454
{
455455
"host": "i686-mingw32",
456-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win32-0.12.0-esp32-20250226.zip",
457-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20250226.zip",
458-
"checksum": "SHA-256:aaf3c955bb4eb47805a1ba108dfd07a8a56ce720cb40194a354362b5f0961230",
459-
"size": "2960226"
456+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win32-0.12.0-esp32-20250422.zip",
457+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20250422.zip",
458+
"checksum": "SHA-256:ecb4f8533fa9098d10000f5f7e8b8eaa8591015b824b481078ddb2b37e7aa6f2",
459+
"size": "2988859"
460460
},
461461
{
462462
"host": "x86_64-mingw32",
463-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win64-0.12.0-esp32-20250226.zip",
464-
"archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20250226.zip",
465-
"checksum": "SHA-256:79baf35325117a53093b62f6b9bee677dd12275d7066e3f8a274d2a80e986b6e",
466-
"size": "2960225"
463+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win64-0.12.0-esp32-20250422.zip",
464+
"archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20250422.zip",
465+
"checksum": "SHA-256:e9eae8e1a8d0e030cd81dcb08394a9137cb7338a6211dfabcdbdfb37b58c5a23",
466+
"size": "2988858"
467467
}
468468
]
469469
},

0 commit comments

Comments
 (0)