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

bootloader_support: Move secure boot code to bootloader_support

Browse Source
This commit is contained in:
Angus Gratton
2016-11-02 17:54:47 +11:00
parent aceb6517c0
commit 98a0387854
5 changed files with 85 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/bootloader/src/main/bootloader_start.c
View File

@@ -34,6 +34,7 @@
#include "sdkconfig.h"
#include "esp_image_format.h"
#include "esp_secure_boot.h"
#include "bootloader_flash.h"
#include "bootloader_config.h"
@@ -214,6 +215,7 @@ void bootloader_main()
{
ESP_LOGI(TAG, "Espressif ESP32 2nd stage bootloader v. %s", BOOT_VERSION);
esp_err_t err;
esp_image_header_t fhdr;
bootloader_state_t bs;
SpiFlashOpResult spiRet1,spiRet2;
@@ -308,8 +310,9 @@ void bootloader_main()
if(fhdr.secure_boot_flag == 0x01) {
/* Generate secure digest from this bootloader to protect future
modifications */
if (secure_boot_generate_bootloader_digest() == false){
ESP_LOGE(TAG, "Bootloader digest generation failed. SECURE BOOT IS NOT ENABLED.");
err = esp_secure_boot_permanently_enable();
if (err != ESP_OK){
ESP_LOGE(TAG, "Bootloader digest generation failed (%d). SECURE BOOT IS NOT ENABLED.", err);
/* Allow booting to continue, as the failure is probably
due to user-configured EFUSEs for testing...
*/