Skip to content

Commit b4f6db6

Browse files
me-no-devme-no-dev
authored
IDF release/v5.1 (#8061)
* IDF release/v5.1 bb9200acec * Update Esp.cpp * IDF release/v5.1 420ebd208a * Update esp32-hal-psram.c
1 parent 20b2715 commit b4f6db6

File tree

821 files changed

+23897
-12823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

821 files changed

+23897
-12823
lines changed

‎cores/esp32/Esp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ uint8_t EspClass::getChipRevision(void)
268268
const char * EspClass::getChipModel(void)
269269
{
270270
#if CONFIG_IDF_TARGET_ESP32
271-
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
271+
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE);
272272
uint32_t pkg_ver = chip_ver & 0x7;
273273
switch (pkg_ver) {
274274
case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6 :

‎cores/esp32/esp32-hal-psram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bool psramInit(){
5050
return false;
5151
}
5252
#if CONFIG_IDF_TARGET_ESP32
53-
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
53+
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE);
5454
uint32_t pkg_ver = chip_ver & 0x7;
5555
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) {
5656
spiramFailed = true;

‎package/package_esp32_index.template.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"packager": "esp32",
7171
"name": "openocd-esp32",
72-
"version": "v0.11.0-esp32-20221026"
72+
"version": "v0.12.0-esp32-20230313"
7373
},
7474
{
7575
"packager": "esp32",
@@ -464,56 +464,56 @@
464464
},
465465
{
466466
"name": "openocd-esp32",
467-
"version": "v0.11.0-esp32-20221026",
467+
"version": "v0.12.0-esp32-20230313",
468468
"systems": [
469469
{
470470
"host": "x86_64-pc-linux-gnu",
471-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz",
472-
"archiveFileName": "openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz",
473-
"checksum": "SHA-256:ce63e9b1dfab60cc62da5dc2abcc22ba7036c42afe74671c787eb026744e7d0b",
474-
"size": "2051435"
471+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-linux-amd64-0.12.0-esp32-20230313.tar.gz",
472+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230313.tar.gz",
473+
"checksum": "SHA-256:a62e560eba02eeca82d52b8eea8ef1e432e083242ce6b01033815e9afad4343e",
474+
"size": "2087489"
475475
},
476476
{
477477
"host": "aarch64-linux-gnu",
478-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-arm64-0.11.0-esp32-20221026.tar.gz",
479-
"archiveFileName": "openocd-esp32-linux-arm64-0.11.0-esp32-20221026.tar.gz",
480-
"checksum": "SHA-256:fe60a3a603e8c6bee47367e40fcb8c0da3a38e01163e9674ebc919b067700506",
481-
"size": "1993843"
478+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-linux-arm64-0.12.0-esp32-20230313.tar.gz",
479+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230313.tar.gz",
480+
"checksum": "SHA-256:12570d3513ace5a8f6f4afb53605abc2ed572243fa36f1c797ae7f7a8558deed",
481+
"size": "1984119"
482482
},
483483
{
484484
"host": "arm-linux-gnueabihf",
485-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-armel-0.11.0-esp32-20221026.tar.gz",
486-
"archiveFileName": "openocd-esp32-linux-armel-0.11.0-esp32-20221026.tar.gz",
487-
"checksum": "SHA-256:6ef76101cca196a4be30fc74f191eff34abb423e32930a383012b866c9b76135",
488-
"size": "2092111"
485+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-linux-armel-0.12.0-esp32-20230313.tar.gz",
486+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230313.tar.gz",
487+
"checksum": "SHA-256:e1b300a87f83a665d33ae9d8f7a47b883f1d0a20a90c30cdaa9ed0750ddc7a61",
488+
"size": "2126878"
489489
},
490490
{
491491
"host": "x86_64-apple-darwin",
492-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
493-
"archiveFileName": "openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
494-
"checksum": "SHA-256:8edc666a0a230432554b73df7c62e0b5ec21fb018e7fda13b11a7ca8b6c1763b",
495-
"size": "2199855"
492+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-macos-0.12.0-esp32-20230313.tar.gz",
493+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230313.tar.gz",
494+
"checksum": "SHA-256:3c462379fdca456eb9fcd696f68b489602cd51d80ebc7b45fc9f0c41404f382a",
495+
"size": "2191546"
496496
},
497497
{
498498
"host": "arm64-apple-darwin",
499-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-macos-arm64-0.11.0-esp32-20221026.tar.gz",
500-
"archiveFileName": "openocd-esp32-macos-arm64-0.11.0-esp32-20221026.tar.gz",
501-
"checksum": "SHA-256:c426c0158ba6488e2f432f7c5b22e79155b5b0fae6d1ad5bbd7894723b43aa12",
502-
"size": "2247179"
499+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-macos-arm64-0.12.0-esp32-20230313.tar.gz",
500+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230313.tar.gz",
501+
"checksum": "SHA-256:d19628bd64008298180a93c36fb8a3f0586c13800f5bb66c0a0f25c7eb9a8d6e",
502+
"size": "2239378"
503503
},
504504
{
505505
"host": "i686-mingw32",
506-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
507-
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
508-
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
509-
"size": "2493214"
506+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-win32-0.12.0-esp32-20230313.zip",
507+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230313.zip",
508+
"checksum": "SHA-256:46580ccb9cc00d76c419636b884c5cc57422124a0a0f755595218f30b92884fa",
509+
"size": "2492151"
510510
},
511511
{
512512
"host": "x86_64-mingw32",
513-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
514-
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
515-
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
516-
"size": "2493214"
513+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-win32-0.12.0-esp32-20230313.zip",
514+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230313.zip",
515+
"checksum": "SHA-256:46580ccb9cc00d76c419636b884c5cc57422124a0a0f755595218f30b92884fa",
516+
"size": "2492151"
517517
}
518518
]
519519
},

‎tools/sdk/esp32/bin/bootloader_dio_40m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dio_80m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_40m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_80m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_40m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_80m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_40m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_80m.elf

48.2 KB
Binary file not shown.

‎tools/sdk/esp32/dio_qspi/include/sdkconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
#define CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE 1
230230
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
231231
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10
232+
#define CONFIG_BOOTLOADER_RESERVE_RTC_MEM 1
232233
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1
233234
#define CONFIG_SECURE_BOOT_V1_SUPPORTED 1
234235
#define CONFIG_APP_COMPILE_TIME_DATE 1
@@ -1078,5 +1079,5 @@
10781079
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
10791080
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
10801081
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1081-
#define CONFIG_ARDUINO_IDF_COMMIT ""
1082+
#define CONFIG_ARDUINO_IDF_COMMIT "420ebd208a"
10821083
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎tools/sdk/esp32/dio_qspi/libspi_flash.a

-3.46 KB
Binary file not shown.

‎tools/sdk/esp32/dout_qspi/include/sdkconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
#define CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE 1
230230
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
231231
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10
232+
#define CONFIG_BOOTLOADER_RESERVE_RTC_MEM 1
232233
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1
233234
#define CONFIG_SECURE_BOOT_V1_SUPPORTED 1
234235
#define CONFIG_APP_COMPILE_TIME_DATE 1
@@ -1078,5 +1079,5 @@
10781079
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
10791080
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
10801081
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1081-
#define CONFIG_ARDUINO_IDF_COMMIT ""
1082+
#define CONFIG_ARDUINO_IDF_COMMIT "420ebd208a"
10821083
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎tools/sdk/esp32/dout_qspi/libspi_flash.a

-3.46 KB
Binary file not shown.

‎tools/sdk/esp32/flags/defines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1-dev-4124-gbb9200acec\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1
1+
-DESP_PLATFORM -DIDF_VER=\"v5.1-dev-4528-g420ebd208a\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1

‎tools/sdk/esp32/flags/includes

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎tools/sdk/esp32/flags/ld_flags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-mlongcalls -Wno-frame-address -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32=0 -Wl,--no-warn-rwx-segments -fno-rtti -fno-lto -Wl,--gc-sections -Wl,--warn-common -Wl,--wrap=esp_log_write -Wl,--wrap=esp_log_writev -Wl,--wrap=log_printf -u ld_include_hli_vectors_bt -u _Z5setupv -u _Z4loopv -u esp_app_desc -u pthread_include_pthread_impl -u pthread_include_pthread_cond_impl -u pthread_include_pthread_local_storage_impl -u pthread_include_pthread_rwlock_impl -u ld_include_highint_hdl -u start_app -u start_app_other_cores -u __ubsan_include -Wl,--wrap=longjmp -u __assert_func -u esp_dport_access_reg_read -Wl,--undefined=uxTopUsedPriority -Wl,--undefined=FreeRTOS_openocd_params -u app_main -u newlib_include_heap_impl -u newlib_include_syscalls_impl -u newlib_include_pthread_impl -u newlib_include_assert_impl -u __cxa_guard_dummy -u include_esp_phy_override -u vfs_include_syscalls_impl
1+
-mlongcalls -Wno-frame-address -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32=0 -Wl,--no-warn-rwx-segments -fno-rtti -fno-lto -Wl,--gc-sections -Wl,--warn-common -Wl,--wrap=esp_log_write -Wl,--wrap=esp_log_writev -Wl,--wrap=log_printf -u ld_include_hli_vectors_bt -u _Z5setupv -u _Z4loopv -u esp_app_desc -u pthread_include_pthread_impl -u pthread_include_pthread_cond_impl -u pthread_include_pthread_local_storage_impl -u pthread_include_pthread_rwlock_impl -u pthread_include_pthread_semaphore_impl -u ld_include_highint_hdl -u start_app -u start_app_other_cores -u __ubsan_include -Wl,--wrap=longjmp -u __assert_func -u esp_dport_access_reg_read -Wl,--undefined=uxTopUsedPriority -Wl,--undefined=FreeRTOS_openocd_params -u app_main -u newlib_include_heap_impl -u newlib_include_syscalls_impl -u newlib_include_pthread_impl -u newlib_include_assert_impl -u __cxa_guard_dummy -u include_esp_phy_override -u vfs_include_syscalls_impl

0 commit comments

Comments
 (0)