Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-18 06:35:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_idf_p4_pm-654' into 'release/v6.0'

Browse Source 
fix(esp_hal_wdt): ESP32P4 RTC WDT stage0 timeout set error(v6.0)

See merge request espressif/esp-idf!45305
This commit is contained in:
Jiang Jiang Jian
2026-01-28 19:08:22 +08:00
parent 422a827f6b 57e4a5b1e4
commit 6bbcab359d
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/bootloader_support/bootloader_flash/src/bootloader_flash.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -537,16 +537,8 @@ static esp_err_t bootloader_flash_read_allow_decrypt(size_t src_addr, void *dest
esp_err_t bootloader_flash_read(size_t src_addr, void *dest, size_t size, bool allow_decrypt)
{
if (src_addr & 3) {
ESP_EARLY_LOGE(TAG, "bootloader_flash_read src_addr 0x%x not 4-byte aligned", src_addr);
return ESP_FAIL;
}
if (size & 3) {
ESP_EARLY_LOGE(TAG, "bootloader_flash_read size 0x%x not 4-byte aligned", size);
return ESP_FAIL;
}
if ((intptr_t)dest & 3) {
ESP_EARLY_LOGE(TAG, "bootloader_flash_read dest 0x%x not 4-byte aligned", (intptr_t)dest);
if ((src_addr & 3) || (size & 3) || ((intptr_t)dest & 3)) {
ESP_EARLY_LOGE(TAG, "bootloader_flash_read src_addr 0x%x, size 0x%x or dest 0x%x not 4-byte aligned", src_addr, size, (intptr_t)dest);
return ESP_FAIL;
}