Skip to content

IDF release/v5.1 #8061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 11, 2023
Merged

IDF release/v5.1 #8061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f194292
IDF release/v5.1 bb9200acec
me-no-dev Apr 11, 2023
cc29d12
Update Esp.cpp
me-no-dev Apr 11, 2023
e6935f8
IDF release/v5.1 420ebd208a
me-no-dev Apr 11, 2023
8c4de65
Update esp32-hal-psram.c
me-no-dev Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cores/esp32/Esp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ uint8_t EspClass::getChipRevision(void)
const char * EspClass::getChipModel(void)
{
#if CONFIG_IDF_TARGET_ESP32
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE);
uint32_t pkg_ver = chip_ver & 0x7;
switch (pkg_ver) {
case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6 :
Expand Down
2 changes: 1 addition & 1 deletion cores/esp32/esp32-hal-psram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bool psramInit(){
return false;
}
#if CONFIG_IDF_TARGET_ESP32
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE);
uint32_t pkg_ver = chip_ver & 0x7;
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) {
spiramFailed = true;
Expand Down
60 changes: 30 additions & 30 deletions package/package_esp32_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
{
"packager": "esp32",
"name": "openocd-esp32",
"version": "v0.11.0-esp32-20221026"
"version": "v0.12.0-esp32-20230313"
},
{
"packager": "esp32",
Expand Down Expand Up @@ -464,56 +464,56 @@
},
{
"name": "openocd-esp32",
"version": "v0.11.0-esp32-20221026",
"version": "v0.12.0-esp32-20230313",
"systems": [
{
"host": "x86_64-pc-linux-gnu",
"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",
"archiveFileName": "openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz",
"checksum": "SHA-256:ce63e9b1dfab60cc62da5dc2abcc22ba7036c42afe74671c787eb026744e7d0b",
"size": "2051435"
"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",
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230313.tar.gz",
"checksum": "SHA-256:a62e560eba02eeca82d52b8eea8ef1e432e083242ce6b01033815e9afad4343e",
"size": "2087489"
},
{
"host": "aarch64-linux-gnu",
"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",
"archiveFileName": "openocd-esp32-linux-arm64-0.11.0-esp32-20221026.tar.gz",
"checksum": "SHA-256:fe60a3a603e8c6bee47367e40fcb8c0da3a38e01163e9674ebc919b067700506",
"size": "1993843"
"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",
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230313.tar.gz",
"checksum": "SHA-256:12570d3513ace5a8f6f4afb53605abc2ed572243fa36f1c797ae7f7a8558deed",
"size": "1984119"
},
{
"host": "arm-linux-gnueabihf",
"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",
"archiveFileName": "openocd-esp32-linux-armel-0.11.0-esp32-20221026.tar.gz",
"checksum": "SHA-256:6ef76101cca196a4be30fc74f191eff34abb423e32930a383012b866c9b76135",
"size": "2092111"
"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",
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230313.tar.gz",
"checksum": "SHA-256:e1b300a87f83a665d33ae9d8f7a47b883f1d0a20a90c30cdaa9ed0750ddc7a61",
"size": "2126878"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
"archiveFileName": "openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
"checksum": "SHA-256:8edc666a0a230432554b73df7c62e0b5ec21fb018e7fda13b11a7ca8b6c1763b",
"size": "2199855"
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-macos-0.12.0-esp32-20230313.tar.gz",
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230313.tar.gz",
"checksum": "SHA-256:3c462379fdca456eb9fcd696f68b489602cd51d80ebc7b45fc9f0c41404f382a",
"size": "2191546"
},
{
"host": "arm64-apple-darwin",
"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",
"archiveFileName": "openocd-esp32-macos-arm64-0.11.0-esp32-20221026.tar.gz",
"checksum": "SHA-256:c426c0158ba6488e2f432f7c5b22e79155b5b0fae6d1ad5bbd7894723b43aa12",
"size": "2247179"
"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",
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230313.tar.gz",
"checksum": "SHA-256:d19628bd64008298180a93c36fb8a3f0586c13800f5bb66c0a0f25c7eb9a8d6e",
"size": "2239378"
},
{
"host": "i686-mingw32",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
"size": "2493214"
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-win32-0.12.0-esp32-20230313.zip",
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230313.zip",
"checksum": "SHA-256:46580ccb9cc00d76c419636b884c5cc57422124a0a0f755595218f30b92884fa",
"size": "2492151"
},
{
"host": "x86_64-mingw32",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
"size": "2493214"
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230313/openocd-esp32-win32-0.12.0-esp32-20230313.zip",
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230313.zip",
"checksum": "SHA-256:46580ccb9cc00d76c419636b884c5cc57422124a0a0f755595218f30b92884fa",
"size": "2492151"
}
]
},
Expand Down
Binary file modified tools/sdk/esp32/bin/bootloader_dio_40m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_dio_80m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_dout_40m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_dout_80m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_qio_40m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_qio_80m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_qout_40m.elf
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/bin/bootloader_qout_80m.elf
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion tools/sdk/esp32/dio_qspi/include/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
#define CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE 1
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10
#define CONFIG_BOOTLOADER_RESERVE_RTC_MEM 1
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1
#define CONFIG_SECURE_BOOT_V1_SUPPORTED 1
#define CONFIG_APP_COMPILE_TIME_DATE 1
Expand Down Expand Up @@ -1078,5 +1079,5 @@
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
#define CONFIG_ARDUINO_IDF_COMMIT ""
#define CONFIG_ARDUINO_IDF_COMMIT "420ebd208a"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"
Binary file modified tools/sdk/esp32/dio_qspi/libspi_flash.a
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion tools/sdk/esp32/dout_qspi/include/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
#define CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE 1
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10
#define CONFIG_BOOTLOADER_RESERVE_RTC_MEM 1
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1
#define CONFIG_SECURE_BOOT_V1_SUPPORTED 1
#define CONFIG_APP_COMPILE_TIME_DATE 1
Expand Down Expand Up @@ -1078,5 +1079,5 @@
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
#define CONFIG_ARDUINO_IDF_COMMIT ""
#define CONFIG_ARDUINO_IDF_COMMIT "420ebd208a"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"
Binary file modified tools/sdk/esp32/dout_qspi/libspi_flash.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32/flags/defines
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
-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
2 changes: 1 addition & 1 deletion tools/sdk/esp32/flags/includes
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/sdk/esp32/flags/ld_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
-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
Loading