Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'docs/update_bootloader_chip_revision_print_v3.2' into 'release/v3.2'

Browse source 
bootloader_support: fix logging prints around chip revision (v3.2)

See merge request espressif/esp-idf!6338
This commit is contained in:
Jiang Jiang Jian 2019-10-21 10:48:46 +08:00
parent a1c1175fa7 d3d4787335
commit 2dc1d1b568
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/bootloader_support/include/bootloader_common.h
View file

@ -23,6 +23,11 @@ typedef enum {
GPIO_NOT_HOLD = 0 /*!< If the GPIO input is not low */ GPIO_NOT_HOLD = 0 /*!< If the GPIO input is not low */
} esp_comm_gpio_hold_t; } esp_comm_gpio_hold_t;
typedef enum {
ESP_IMAGE_BOOTLOADER,
ESP_IMAGE_APPLICATION
} esp_image_type;
/** /**
* @brief Calculate crc for the OTA data partition. * @brief Calculate crc for the OTA data partition.
* *
@ -103,12 +108,13 @@ uint8_t bootloader_common_get_chip_revision(void);
/** /**
* @brief Check if the image (bootloader and application) has valid chip ID and revision * @brief Check if the image (bootloader and application) has valid chip ID and revision
* *
* @param img_hdr: image header * @param[in] img_hdr: image header
* @param[in] type: image type, bootloader or application
* @return * @return
* - ESP_OK: image and chip are matched well * - ESP_OK: image and chip are matched well
* - ESP_FAIL: image doesn't match to the chip * - ESP_FAIL: image doesn't match to the chip
*/ */
esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr); esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr, esp_image_type type);
/** /**

8
components/bootloader_support/src/bootloader_common.c
View file

@ -241,20 +241,20 @@ uint8_t bootloader_common_get_chip_revision(void)
return chip_ver; return chip_ver;
} }
esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr) esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hdr, esp_image_type type)
{ {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
esp_chip_id_t chip_id = CONFIG_IDF_FIRMWARE_CHIP_ID; esp_chip_id_t chip_id = CONFIG_IDF_FIRMWARE_CHIP_ID;
if (chip_id != img_hdr->chip_id) { if (chip_id != img_hdr->chip_id) {
ESP_LOGE(TAG, "mismatch chip ID, expect %d, found %d", chip_id, img_hdr->chip_id); ESP_LOGE(TAG, "mismatch chip ID, expected %d, found %d", chip_id, img_hdr->chip_id);
err = ESP_FAIL; err = ESP_FAIL;
} }
uint8_t revision = bootloader_common_get_chip_revision(); uint8_t revision = bootloader_common_get_chip_revision();
if (revision < img_hdr->min_chip_rev) { if (revision < img_hdr->min_chip_rev) {
ESP_LOGE(TAG, "can't run on lower chip revision, expect %d, found %d", revision, img_hdr->min_chip_rev); ESP_LOGE(TAG, "can't run on lower chip revision, expected %d, found %d", revision, img_hdr->min_chip_rev);
err = ESP_FAIL; err = ESP_FAIL;
} else if (revision != img_hdr->min_chip_rev) { } else if (revision != img_hdr->min_chip_rev) {
ESP_LOGI(TAG, "mismatch chip revision, expect %d, found %d", revision, img_hdr->min_chip_rev); ESP_LOGI(TAG, "chip revision: %d, min. %s chip revision: %d", revision, type == ESP_IMAGE_BOOTLOADER ? "bootloader" : "application", img_hdr->min_chip_rev);
} }
return err; return err;
} }

2
components/bootloader_support/src/bootloader_init.c
View file

@ -130,7 +130,7 @@ static esp_err_t bootloader_main()
/* Check chip ID and minimum chip revision that supported by this image */ /* Check chip ID and minimum chip revision that supported by this image */
uint8_t revision = bootloader_common_get_chip_revision(); uint8_t revision = bootloader_common_get_chip_revision();
ESP_LOGI(TAG, "Chip Revision: %d", revision); ESP_LOGI(TAG, "Chip Revision: %d", revision);
if (bootloader_common_check_chip_validity(&fhdr) != ESP_OK) { if (bootloader_common_check_chip_validity(&fhdr, ESP_IMAGE_BOOTLOADER) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
bootloader_init_flash_configure(&fhdr); bootloader_init_flash_configure(&fhdr);

2
components/bootloader_support/src/esp_image_format.c
View file

@ -281,7 +281,7 @@ static esp_err_t verify_image_header(uint32_t src_addr, const esp_image_header_t
} }
err = ESP_ERR_IMAGE_INVALID; err = ESP_ERR_IMAGE_INVALID;
} }
if (bootloader_common_check_chip_validity(image) != ESP_OK) { if (bootloader_common_check_chip_validity(image, ESP_IMAGE_APPLICATION) != ESP_OK) {
err = ESP_ERR_IMAGE_INVALID; err = ESP_ERR_IMAGE_INVALID;
} }
if (!silent) { if (!silent) {