Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/spi_flash_private_v6.0' into 'release/v6.0'

Browse Source 
refactor(spi_flash): reorganize header files, improve encapsulation and simplify ROM implementation (v6.0)

See merge request espressif/esp-idf!45488
This commit is contained in:
Jiang Jiang Jian
2026-02-02 10:57:34 +08:00
parent ade2c48169 34035b0e7c
commit 31056d5db9
89 changed files with 566 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/app_update/test_apps/test_app_update/main/test_bootloader_update.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "unity.h"
#include "esp_log.h"
#include "esp_efuse.h"
#include "esp_flash_internal.h"
#include "esp_private/esp_flash_internal.h" //For dangerous write protection
#include "esp_rom_sys.h"
#include "utils_update.h"
#include "sdkconfig.h"
components/app_update/test_apps/test_app_update/main/test_ota_partitions.c
+3 -6
View File
@@ -6,7 +6,7 @@
#include "esp_ota_ops.h"
#include "esp_partition.h"
#include "esp_flash_partitions.h"
#include "esp_flash_internal.h"
#include "esp_flash.h"
#include "spi_flash_mmap.h"
#include "esp_image_format.h"
#include "esp_system.h"
@@ -34,12 +34,9 @@ static uint32_t find_unused_space(size_t required_size)
esp_partition_iterator_release(it);
TEST_ASSERT_NOT_NULL(latest_partition);
#if CONFIG_IDF_TARGET_LINUX
uint32_t flash_chip_size;
esp_flash_get_size(NULL, &flash_chip_size);
#else
uint32_t flash_chip_size = esp_flash_default_chip->size;
#endif // CONFIG_IDF_TARGET_LINUX
esp_err_t ret = esp_flash_get_size(esp_flash_default_chip, &flash_chip_size);
TEST_ASSERT_EQUAL(ESP_OK, ret);
uint32_t unused_offset = latest_partition->address + latest_partition->size;
TEST_ASSERT_GREATER_OR_EQUAL_UINT32(required_size, flash_chip_size - unused_offset);
return unused_offset;