Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

change(flash): deprecate bootloader_flash_priv.h

Browse Source
This commit is contained in:
armando
2026-06-02 11:13:54 +08:00
committed by Armando (Dou Yiwen)
parent 6e3abd12a1
commit 2cacb0bd56
49 changed files with 241 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/app_update/test_apps/test_app_update/main/test_switch_ota.c
View File

@@ -9,7 +9,7 @@
#include "esp_system.h"
#include "bootloader_common.h"
#include "../bootloader_flash/include/bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_log.h"
#include "esp_ota_ops.h"
#include "unity.h"

2
components/app_update/test_apps/test_app_update/main/utils_update.c
View File

@@ -10,7 +10,7 @@
#include "esp_partition.h"
#include "esp_flash_partitions.h"
#include "esp_image_format.h"
#include "../bootloader_flash/include/bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_sleep.h"
#include "esp_ota_ops.h"
#include "esp_err.h"

22
components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -16,6 +16,26 @@ extern "C" {
typedef unsigned (*bootloader_flash_read_status_fn_t)(void);
typedef void (*bootloader_flash_write_status_fn_t)(unsigned);
/**
* @brief Execute a user command on the flash
*
* @param command The command value to execute.
* @param mosi_data MOSI data to send
* @param mosi_len Length of MOSI data, in bits
* @param miso_len Length of MISO data to receive, in bits
* @return Received MISO data
*/
uint32_t bootloader_execute_flash_command(uint8_t command, uint32_t mosi_data, uint8_t mosi_len, uint8_t miso_len);
/**
* @brief Read the SFDP of the flash
*
* @param sfdp_addr Address of the parameter to read
* @param miso_byte_num Bytes to read
* @return The read SFDP, little endian, 4 bytes at most
*/
uint32_t bootloader_flash_read_sfdp(uint32_t sfdp_addr, unsigned int miso_byte_num);
typedef struct __attribute__((packed))
{
const char *manufacturer;

149
components/bootloader_support/bootloader_flash/include/esp_private/bootloader_flash_internal.h
View File

@@ -1,17 +1,161 @@
/*
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <stdint.h>
#include <esp_err.h>
#include <stddef.h>
#include <stdbool.h>
#include "esp_err.h"
#include "sdkconfig.h"
#include "bootloader_flash.h"
#include "bootloader_flash_override.h"
#include "soc/soc_caps.h"
#include "soc/ext_mem_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
//-------------------------------- Utilities -------------------------------- //
/**
* This file provides a Flash API for bootloader_support code,
* that can be used from bootloader or app code.
* This header is available to source code in the ESP-IDF components only.
*/
#define FLASH_SECTOR_SIZE 0x1000
#define FLASH_BLOCK_SIZE 0x10000
#define MMAP_ALIGNED_MASK (CONFIG_MMU_PAGE_SIZE - 1)
#define MMU_FLASH_MASK (~(CONFIG_MMU_PAGE_SIZE - 1))
#define MMU_FLASH_MASK_FROM_VAL(PAGE_SZ) (~((PAGE_SZ) - 1))
#define MMU_DROM_END_ENTRY_VADDR_FROM_VAL(PAGE_SZ) (SOC_DRAM_FLASH_ADDRESS_HIGH - (PAGE_SZ))
/**
* MMU mapping must always be in the unit of a CONFIG_MMU_PAGE_SIZE
* This macro is a helper for you to get needed page nums to be mapped. e.g.:
* Let's say CONFIG_MMU_PAGE_SIZE is 64KB.
* - v_start = 0x4200_0004
* - size = 4 * 64KB
*
* You should map from 0x4200_0000, then map 5 pages.
*/
#define GET_REQUIRED_MMU_PAGES(size, v_start) ((size + (v_start - (v_start & MMU_FLASH_MASK)) + CONFIG_MMU_PAGE_SIZE - 1) / CONFIG_MMU_PAGE_SIZE)
/**
* @brief Get number of free pages
*
* @return Number of free pages
*/
uint32_t bootloader_mmap_get_free_pages(void);
/**
* @brief Map a region of flash to data memory
*
* @important In bootloader code, only one region can be bootloader_mmaped at once. The previous region must be bootloader_munmapped before another region is mapped.
*
* @important In app code, these functions are not thread safe.
*
* Call bootloader_munmap once for each successful call to bootloader_mmap.
*
* In esp-idf app, this function maps directly to spi_flash_mmap with the @ref
* spi_flash_mmap_flag_t::SPI_FLASH_MMAP_FLAG_BLOCKS_WRITE flag set. When XIP on PSRAM (`CONFIG_SPIRAM_XIP_FROM_PSRAM`) enabled, flash erasing/writing
* will be blocked until unmap.
*
* @param offset - Starting flash offset to map to memory.
* @param length - Length of data to map.
*
* @return Pointer to mapped data memory (at src_addr), or NULL
* if an allocation error occurred.
*/
const void *bootloader_mmap(uint32_t src_addr, uint32_t size);
/**
* @brief Unmap a previously mapped region of flash
*
* Call bootloader_munmap once for each successful call to bootloader_mmap.
*/
void bootloader_munmap(const void *mapping);
/**
* @brief Read data from Flash.
*
*
* @note All of src, dest and size have to be 4-byte aligned.
*
* @param src source address of the data in Flash.
* @param dest pointer to the destination buffer
* @param size length of data
* @param allow_decrypt If true and flash encryption is enabled, data on flash
* will be decrypted transparently as part of the read.
*
* @return ESP_OK on success, ESP_ERR_FLASH_OP_FAIL on SPI failure,
* ESP_ERR_FLASH_OP_TIMEOUT on SPI timeout.
*/
esp_err_t bootloader_flash_read(size_t src_addr, void *dest, size_t size, bool allow_decrypt);
/**
* @brief Write data to Flash.
*
* @note All of dest_addr, src and size have to be 4-byte aligned. If write_encrypted is set, dest_addr and size must be 32-byte aligned.
*
* @note In bootloader, when write_encrypted == true, the src buffer is encrypted in place.
*
* @note [ESP-TEE] Using this API from the TEE will return an error if the dest_addr lies
* within the active TEE partition range.
*
* @param dest_addr Destination address to write in Flash.
* @param src Pointer to the data to write to flash
* @param size Length of data in bytes.
* @param write_encrypted If true, data will be written encrypted on flash.
*
* @return ESP_OK on success, ESP_ERR_FLASH_OP_FAIL on SPI failure,
* ESP_ERR_FLASH_OP_TIMEOUT on SPI timeout.
*/
esp_err_t bootloader_flash_write(size_t dest_addr, void *src, size_t size, bool write_encrypted);
/**
* @brief Erase the Flash sector.
*
* @param sector Sector number, the count starts at sector 0, 4KB per sector.
*
* @return esp_err_t
*/
esp_err_t bootloader_flash_erase_sector(size_t sector);
/**
* @brief Erase the Flash range.
*
* @note [ESP-TEE] Using this API from the TEE will return an error if the start_addr lies
* within the active TEE partition range.
*
* @param start_addr start address of flash offset
* @param size sector aligned size to be erased
*
* @return esp_err_t
*/
esp_err_t bootloader_flash_erase_range(uint32_t start_addr, uint32_t size);
/**
* @brief Enable the flash write protect (WEL bit).
*/
void bootloader_enable_wp(void);
/**
* @brief Once this function is called,
* any on-going internal operations will be terminated and the device will return to its default power-on
* state and lose all the current volatile settings, such as Volatile Status Register bits, Write Enable Latch
* (WEL) status, Program/Erase Suspend status, etc.
*/
void bootloader_spi_flash_reset(void);
//-------------------------------- Init APIs -------------------------------- //
//For SDK usage only
/**
* @brief Initialize spi_flash in bootloader and print flash info
*
@@ -33,6 +177,7 @@ void bootloader_flash_hardware_init(void);
*/
void bootloader_init_mspi_clock(void);
#ifdef __cplusplus
}
#endif

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c
View File

@@ -25,7 +25,8 @@
#include "flash_qio_mode.h"
#include "bootloader_common.h"
#include "bootloader_flash_config.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#define FLASH_CLK_IO MSPI_IOMUX_PIN_NUM_CLK

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c
View File

@@ -17,7 +17,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "soc/spi_pins.h"
#include "hal/mmu_hal.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c
View File

@@ -19,7 +19,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c5.c
View File

@@ -22,7 +22,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c
View File

@@ -18,7 +18,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c61.c
View File

@@ -18,7 +18,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h2.c
View File

@@ -18,7 +18,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h21.c
View File

@@ -12,7 +12,8 @@
#include "esp_rom_gpio.h"
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/cache_hal.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h4.c
View File

@@ -20,7 +20,8 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32p4.c
View File

@@ -16,7 +16,7 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"
@@ -24,6 +24,7 @@
#include "hal/cache_hal.h"
#include "hal/cache_ll.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
void IRAM_ATTR bootloader_flash_update_id(void)
{

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s2.c
View File

@@ -20,7 +20,8 @@
#include "soc/soc_caps.h"
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
#include "bootloader_common.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"

3
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s31.c
View File

@@ -16,7 +16,7 @@
#include "flash_qio_mode.h"
#include "bootloader_flash_config.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_init.h"
#include "hal/mmu_hal.h"
#include "hal/mmu_ll.h"
@@ -25,6 +25,7 @@
#include "hal/cache_ll.h"
#include "hal/clk_tree_ll.h"
#include "esp_private/bootloader_flash_internal.h"
#include "spi_flash_defs.h"
void IRAM_ATTR bootloader_flash_update_id(void)
{

3
components/bootloader_support/bootloader_flash/src/flash_qio_mode.c
View File

@@ -8,7 +8,7 @@
#include "bootloader_flash_config.h"
#include "flash_qio_mode.h"
#include "sdkconfig.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_log.h"
#include "esp_err.h"
#include "esp_attr.h"
@@ -19,6 +19,7 @@
#include "soc/io_mux_reg.h"
#include "esp_private/spi_flash_os.h"
#include "bootloader_flash_override.h"
#include "spi_flash_defs.h"
ESP_LOG_ATTR_TAG(TAG, "qio_mode");

2
components/bootloader_support/src/bootloader_common.c
View File

@@ -15,7 +15,7 @@
#include "esp_rom_sys.h"
#include "esp_flash_partitions.h"
#include "esp_image_format.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_common.h"
#include "bootloader_utility.h"
#include "bootloader_sha_flash.h"

2
components/bootloader_support/src/bootloader_init.c
View File

@@ -9,7 +9,7 @@
#include "esp_attr.h"
#include "esp_log.h"
#include "bootloader_init.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_flash_config.h"
#include "bootloader_random.h"
#include "bootloader_clock.h"

2
components/bootloader_support/src/bootloader_utility_tee.c
View File

@@ -16,7 +16,7 @@
#include "esp_image_format.h"
#include "bootloader_config.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_utility.h"
#include "bootloader_utility_tee.h"

1
components/bootloader_support/src/esp32/bootloader_esp32.c
View File

@@ -16,7 +16,6 @@
#include "bootloader_flash_config.h"
#include "bootloader_mem.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_cpu.h"
#include "soc/dport_reg.h"

2
components/bootloader_support/src/esp32c2/bootloader_esp32c2.c
View File

@@ -30,7 +30,7 @@
#include "bootloader_flash_config.h"
#include "bootloader_mem.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

1
components/bootloader_support/src/esp32c3/bootloader_esp32c3.c
View File

@@ -34,7 +34,6 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32c5/bootloader_esp32c5.c
View File

@@ -31,7 +31,7 @@
#include "bootloader_mem.h"
#include "esp_private/regi2c_ctrl.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32c6/bootloader_esp32c6.c
View File

@@ -33,7 +33,7 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32c61/bootloader_esp32c61.c
View File

@@ -33,7 +33,7 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32h2/bootloader_esp32h2.c
View File

@@ -32,7 +32,7 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32h21/bootloader_esp32h21.c
View File

@@ -32,7 +32,7 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32h4/bootloader_esp32h4.c
View File

@@ -30,7 +30,7 @@
#include "esp_private/regi2c_ctrl.h"
#include "soc/hp_system_reg.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32p4/bootloader_esp32p4.c
View File

@@ -33,7 +33,7 @@
#include "soc/regi2c_lp_bias.h"
#include "soc/regi2c_bias.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

1
components/bootloader_support/src/esp32s2/bootloader_esp32s2.c
View File

@@ -16,7 +16,6 @@
#include "bootloader_flash_config.h"
#include "bootloader_mem.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_rom_gpio.h"
#include "esp_rom_efuse.h"

2
components/bootloader_support/src/esp32s3/bootloader_esp32s3.c
View File

@@ -33,7 +33,7 @@
#include "bootloader_flash_config.h"
#include "bootloader_mem.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_efuse.h"

2
components/bootloader_support/src/esp32s31/bootloader_esp32s31.c
View File

@@ -16,7 +16,7 @@
#include "bootloader_flash_config.h"
#include "bootloader_mem.h"
#include "bootloader_console.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_soc.h"
#include "esp_efuse.h"
#include "esp_private/bootloader_flash_internal.h"

2
components/bootloader_support/src/flash_encryption/flash_encrypt.c
View File

@@ -5,7 +5,7 @@
*/
#include <strings.h>
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_random.h"
#include "esp_image_format.h"
#include "esp_flash_encrypt.h"

2
components/efuse/src/esp_efuse_utility.c
View File

@@ -390,7 +390,7 @@ void esp_efuse_init_virtual_mode_in_ram(void)
#ifdef CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH
#include "../bootloader_flash/include/bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
static uint32_t esp_efuse_flash_offset = 0;
static uint32_t esp_efuse_flash_size = 0;

4
components/esp_image_verify/src/bootloader_sha_flash.c
View File

@@ -5,7 +5,7 @@
*/
#include <sys/param.h>
#include "esp_log.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "spi_flash_mmap.h"
@@ -57,7 +57,7 @@ static esp_err_t bootloader_sha_flash_contents(esp_sha_type type, uint32_t flash
return ESP_ERR_NO_MEM;
}
uint32_t max_image_len;
if (__builtin_mul_overflow(max_pages, SPI_FLASH_MMU_PAGE_SIZE, &max_image_len)) {
if (__builtin_mul_overflow(max_pages, CONFIG_MMU_PAGE_SIZE, &max_image_len)) {
max_image_len = UINT32_MAX;
}
uint32_t partial_image_len = MIN(len, max_image_len); /* Read the image that fits in the free MMU pages */

2
components/esp_image_verify/src/secure_boot_v1/secure_boot.c
View File

@@ -17,7 +17,7 @@
#include "sdkconfig.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_random.h"
#include "esp_image_format.h"
#include "esp_secure_boot.h"

2
components/esp_image_verify/src/secure_boot_v1/secure_boot_signatures_app.c
View File

@@ -5,7 +5,7 @@
*/
#include "sdkconfig.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "esp_log.h"

2
components/esp_image_verify/src/secure_boot_v1/secure_boot_signatures_bootloader.c
View File

@@ -5,7 +5,7 @@
*/
#include "sdkconfig.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "esp_log.h"

2
components/esp_image_verify/src/secure_boot_v2/secure_boot.c
View File

@@ -8,7 +8,7 @@
#include "sdkconfig.h"
#include "esp_log.h"
#include "esp_secure_boot.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "esp_image_format.h"

2
components/esp_image_verify/src/secure_boot_v2/secure_boot_signatures_app.c
View File

@@ -5,7 +5,7 @@
*/
#include "sdkconfig.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "bootloader_signature.h"

2
components/esp_image_verify/src/secure_boot_v2/secure_boot_signatures_bootloader.c
View File

@@ -7,7 +7,7 @@
#include <string.h>
#include "esp_fault.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "bootloader_sha.h"
#include "bootloader_sha_flash.h"
#include "bootloader_signature.h"

2
components/esp_mspi/spi_flash_hpm_enable.c
View File

@@ -65,8 +65,6 @@ extern uint32_t bootloader_flash_execute_command_common(
uint8_t mosi_len, uint32_t mosi_data,
uint8_t miso_len);
extern uint32_t IRAM_ATTR bootloader_flash_read_sfdp(uint32_t sfdp_addr, unsigned int miso_byte_num);
//-----------------For flash chips which enter HPM via command-----------------------//
/**

2
components/esp_tee/subproject/components/attestation/esp_att_utils_part_info.c
View File

@@ -39,7 +39,7 @@
#endif
#define DECLARE_PRIVATE_IDENTIFIERS
#include "psa/crypto.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_attestation_utils.h"
#include "esp_macros.h"

2
components/esp_tee/subproject/components/tee_flash_mgr/include/esp_tee_flash.h
View File

@@ -9,7 +9,7 @@
#include "esp_err.h"
#include "bootloader_flash_priv.h"
#include "esp_private/bootloader_flash_internal.h"
#include "esp_flash_partitions.h"
#include "esp_image_format.h"

10
docs/en/migration-guides/release-6.x/6.1/peripherals.rst
View File

@@ -9,6 +9,16 @@ LCD
- The :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_refresh_done` callback has been deprecated. Please use :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_frame_buf_complete` to know when a frame buffer can be safely reused.
- The VSYNC timing event for the MIPI DSI DPI panel is now reported by :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_vsync`.
SPI Flash
---------
- ``bootloader_flash_priv.h`` header file is deprecated. Its contents have been split into two headers:
- ``bootloader_flash_override.h`` for the utility APIs intended for custom flash chip support, such as ``bootloader_execute_flash_command``, ``bootloader_flash_read_sfdp``, and the status register read/write helpers. This header is not considered a stable API, but it remains available to applications and custom bootloader components.
- ``esp_private/bootloader_flash_internal.h`` for the APIs that are internal to ESP-IDF, such as ``bootloader_mmap``, ``bootloader_munmap``, and ``bootloader_flash_read``. These may change without notice.
The deprecated ``bootloader_flash_priv.h`` still includes both headers, so existing code keeps compiling until the header is removed.
UART
-----

10
docs/zh_CN/migration-guides/release-6.x/6.1/peripherals.rst
View File

@@ -9,6 +9,16 @@ LCD
- :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_refresh_done` 回调已废弃。请使用 :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_frame_buf_complete` 判断帧缓冲区何时可以被安全复用。
- MIPI DSI DPI 面板的 VSYNC 时序事件现在通过 :cpp:member:`esp_lcd_dpi_panel_event_callbacks_t::on_vsync` 回调上报。
SPI Flash
---------
- ``bootloader_flash_priv.h`` 头文件已废弃，其内容已拆分到两个头文件中：
- ``bootloader_flash_override.h``：面向自定义 flash 芯片支持的工具类 API，例如 ``bootloader_execute_flash_command``、``bootloader_flash_read_sfdp`` 以及状态寄存器读写辅助函数。该头文件不被视为稳定 API，但应用程序和自定义 bootloader 组件仍可使用。
- ``esp_private/bootloader_flash_internal.h``：ESP-IDF 内部使用的 API，例如 ``bootloader_mmap``、``bootloader_munmap`` 和 ``bootloader_flash_read``，这些 API 可能在不另行通知的情况下发生变更。
已废弃的 ``bootloader_flash_priv.h`` 仍会包含上述两个头文件，因此在该头文件被移除之前，现有代码可以继续正常编译。
UART
------

1
examples/custom_bootloader/bootloader_multiboot/bootloader_components/main/bootloader_start.c
View File

@@ -11,7 +11,6 @@
#include "bootloader_init.h"
#include "bootloader_utility.h"
#include "bootloader_common.h"
#include "bootloader_flash_priv.h"
#include "esp_app_desc.h"
#define MAX_PARTITIONS 8

1
examples/storage/custom_flash_driver/bootloader_components/bootloader_flash/bootloader_flash_qio_custom.c
View File

@@ -4,7 +4,6 @@
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
#include "bootloader_flash_override.h"
#include "bootloader_flash_priv.h"
#include "bootloader_flash_custom.h"
#include "esp_rom_spiflash.h"
#include "esp_attr.h"