Merge branch 'feature/update_fe_api_to_disable_bootloader_cache' into 'master'

feat: Uncomment UART bootloader cache code in FE for ESP32C5

See merge request espressif/esp-idf!31910
This commit is contained in:
Mahavir Jain
2024-07-10 12:27:17 +08:00

View File

@@ -23,13 +23,12 @@ esp_err_t esp_flash_encryption_enable_secure_features(void)
ESP_LOGW(TAG, "Not disabling UART bootloader encryption"); ESP_LOGW(TAG, "Not disabling UART bootloader encryption");
#endif #endif
// TODO: [ESP32C5] IDF-8623 check if the following code is still supported #ifndef CONFIG_SECURE_FLASH_UART_BOOTLOADER_ALLOW_CACHE
// #ifndef CONFIG_SECURE_FLASH_UART_BOOTLOADER_ALLOW_CACHE ESP_LOGI(TAG, "Disable UART bootloader cache...");
// ESP_LOGI(TAG, "Disable UART bootloader cache..."); esp_efuse_write_field_bit(ESP_EFUSE_SPI_DOWNLOAD_MSPI_DIS);
// esp_efuse_write_field_bit(ESP_EFUSE_DIS_DOWNLOAD_ICACHE); #else
// #else ESP_LOGW(TAG, "Not disabling UART bootloader cache - SECURITY COMPROMISED");
// ESP_LOGW(TAG, "Not disabling UART bootloader cache - SECURITY COMPROMISED"); #endif
// #endif
#ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG
ESP_LOGI(TAG, "Disable JTAG..."); ESP_LOGI(TAG, "Disable JTAG...");