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 'master' into feature/esp32s2beta_merge

Browse Source
This commit is contained in:
Ivan Grokhotkov
2019-10-02 18:57:40 +02:00
parent b6a8dfba44 adbf0bff53
commit 5830f529d8
115 changed files with 2439 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bootloader_support/src/bootloader_init.c
View File

@@ -60,7 +60,6 @@
#endif
#include "sdkconfig.h"
#include "esp_efuse.h"
#include "esp_image_format.h"
#include "esp_secure_boot.h"
#include "esp_flash_encrypt.h"
@@ -171,7 +170,7 @@ static esp_err_t bootloader_main(void)
}
/* Check chip ID and minimum chip revision that supported by this image */
uint8_t revision = esp_efuse_get_chip_ver();
uint8_t revision = bootloader_common_get_chip_revision();
ESP_LOGI(TAG, "Chip Revision: %d", revision);
if (bootloader_common_check_chip_validity(&fhdr) != ESP_OK) {
return ESP_FAIL;