alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-12 13:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.3' into 'release/v3.3'

Browse Source 
flash encryption: Add config option to disable any plaintext reflashes (3.3)

See merge request espressif/esp-idf!5280
This commit is contained in:
Angus Gratton
2019-09-05 08:00:39 +08:00
parent 85a89db863 e8a4e70c42
commit 3201333f06
4 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp32/cpu_start.c
View File

@@ -69,6 +69,7 @@
#include "esp_clk_internal.h"
#include "esp_timer.h"
#include "esp_pm.h"
#include "esp_flash_encrypt.h"
#include "pm_impl.h"
#include "trax.h"
#include "esp_ota_ops.h"
@@ -348,6 +349,11 @@ void start_cpu0_default(void)
#endif
#if CONFIG_DISABLE_BASIC_ROM_CONSOLE
esp_efuse_disable_basic_rom_console();
#endif
#ifdef CONFIG_FLASH_ENCRYPTION_DISABLE_PLAINTEXT
if (esp_flash_encryption_enabled()) {
esp_flash_write_protect_crypt_cnt();
}
#endif
rtc_gpio_force_hold_dis_all();
esp_vfs_dev_uart_register();