From dd9706564fc1340eada52d672d31d535fff13c64 Mon Sep 17 00:00:00 2001 From: Xiao Xufeng Date: Sun, 18 Jan 2026 04:33:30 +0800 Subject: [PATCH] fix(tee): fix failed to configure flash on C6 v0.1 and above when REV_MIN_0 configured --- .../bootloader_flash/src/bootloader_flash.c | 32 ++++++++++--------- components/esp_rom/patches/esp_rom_sys.c | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c index 938e175cd9..d0b8aa449d 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c @@ -232,19 +232,20 @@ static uint32_t current_read_mapping = UINT32_MAX; */ static void rom_read_api_workaround(void) { -#if CONFIG_ESP32C6_REV_MIN_0 - extern void spi_common_set_dummy_output(esp_rom_spiflash_read_mode_t mode); - extern void spi_dummy_len_fix(uint8_t spi, uint8_t freqdiv); +#if CONFIG_ESP32C6_REV_MIN_FULL == 0 + if (efuse_hal_chip_revision() == 0) { + extern void spi_common_set_dummy_output(esp_rom_spiflash_read_mode_t mode); + extern void spi_dummy_len_fix(uint8_t spi, uint8_t freqdiv); - static bool is_first_call = true; - if (is_first_call) { - uint32_t dummy_val = UINT32_MAX; - uint32_t dest_addr = ESP_PARTITION_TABLE_OFFSET + ESP_PARTITION_TABLE_MAX_LEN; - esp_rom_spiflash_write(dest_addr, &dummy_val, sizeof(dummy_val)); - is_first_call = false; - } + static bool is_first_call = true; + if (is_first_call) { + uint32_t dummy_val = UINT32_MAX; + uint32_t dest_addr = ESP_PARTITION_TABLE_OFFSET + ESP_PARTITION_TABLE_MAX_LEN; + esp_rom_spiflash_write(dest_addr, &dummy_val, sizeof(dummy_val)); + is_first_call = false; + } - uint32_t freqdiv = 0; + uint32_t freqdiv = 0; #if CONFIG_ESPTOOLPY_FLASHFREQ_80M freqdiv = 1; @@ -265,10 +266,11 @@ static void rom_read_api_workaround(void) read_mode = ESP_ROM_SPIFLASH_DOUT_MODE; #endif - esp_rom_spiflash_config_clk(freqdiv, 1); - spi_dummy_len_fix(1, freqdiv); - esp_rom_spiflash_config_readmode(read_mode); - spi_common_set_dummy_output(read_mode); + esp_rom_spiflash_config_clk(freqdiv, 1); + spi_dummy_len_fix(1, freqdiv); + esp_rom_spiflash_config_readmode(read_mode); + spi_common_set_dummy_output(read_mode); + } #endif } diff --git a/components/esp_rom/patches/esp_rom_sys.c b/components/esp_rom/patches/esp_rom_sys.c index 02e1265c40..efac5a47d5 100644 --- a/components/esp_rom/patches/esp_rom_sys.c +++ b/components/esp_rom/patches/esp_rom_sys.c @@ -158,5 +158,5 @@ void __attribute__((constructor)) ets_ops_set_rom_patches(void) ets_ops_table_ptr = &ets_ops_patch_table_ptr; } -#endif // CONFIG_ESP32C5_REV_MIN_100 || CONFIG_ESP32C61_REV_MIN_100 +#endif // CONFIG_ESP32C5_REV_MIN_FULL <= 100 || CONFIG_ESP32C61_REV_MIN_FULL <= 100 #endif // ESP_ROM_DELAY_US_PATCH && CONFIG_SECURE_ENABLE_TEE && !NON_OS_BUILD