Merge branch 'fix/cache_wb_patch_skip_bootloader_v6.1' into 'release/v6.1'

fix(esp_rom): Cache_WriteBack_All patch should skip bootloader v6.1

See merge request espressif/esp-idf!48918
This commit is contained in:
Jiang Jiang Jian
2026-05-28 10:28:24 +08:00
2 changed files with 4 additions and 0 deletions

View File

@@ -31,6 +31,7 @@ int Cache_WriteBack_Addr(uint32_t addr, uint32_t size)
return 0;
}
#ifndef BOOTLOADER_BUILD
void Cache_WriteBack_All(void)
{
REG_WRITE(CACHE_SYNC_MAP_REG, CACHE_MAP_FLASH_CACHE);
@@ -42,6 +43,7 @@ void Cache_WriteBack_All(void)
REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
}
#endif
int Cache_WriteBack_Invalidate_Addr(uint32_t addr, uint32_t size)
{

View File

@@ -52,6 +52,7 @@ int Cache_WriteBack_Addr(uint32_t map, uint32_t addr, uint32_t size)
return 0;
}
#ifndef BOOTLOADER_BUILD
int Cache_WriteBack_All(uint32_t map)
{
/* writeback readonly cache is invalid */
@@ -74,6 +75,7 @@ int Cache_WriteBack_All(uint32_t map)
return 0;
}
#endif
int Cache_WriteBack_Invalidate_Addr(uint32_t map, uint32_t addr, uint32_t size)
{