diff --git a/components/bootloader_support/src/bootloader_common_loader.c b/components/bootloader_support/src/bootloader_common_loader.c index 2f00fc4da2..872003ca95 100644 --- a/components/bootloader_support/src/bootloader_common_loader.c +++ b/components/bootloader_support/src/bootloader_common_loader.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -67,14 +67,14 @@ esp_err_t bootloader_common_check_efuse_blk_validity(uint32_t min_rev_full, uint uint32_t major_rev = revision / 100; uint32_t minor_rev = revision % 100; if (IS_FIELD_SET(min_rev_full) && !ESP_EFUSE_BLK_REV_ABOVE(revision, min_rev_full)) { - ESP_LOGE(TAG, "Image requires efuse blk rev >= v%"PRIu32".%"PRIu32", but chip is v%"PRIu32".%"PRIu32, - min_rev_full / 100, min_rev_full % 100, major_rev, minor_rev); + ESP_LOGE(TAG, "efuse blk rev = v%"PRIu32".%"PRIu32" < min rev v%"PRIu32".%"PRIu32, + major_rev, minor_rev, min_rev_full / 100, min_rev_full % 100); err = ESP_FAIL; } // If burnt `disable_blk_version_major` bit, skip the max version check if ((IS_FIELD_SET(max_rev_full) && (revision > max_rev_full) && !efuse_hal_get_disable_blk_version_major())) { - ESP_LOGE(TAG, "Image requires efuse blk rev <= v%"PRIu32".%"PRIu32", but chip is v%"PRIu32".%"PRIu32, - max_rev_full / 100, max_rev_full % 100, major_rev, minor_rev); + ESP_LOGE(TAG, "efuse blk rev = v%"PRIu32".%"PRIu32" > max rev v%"PRIu32".%"PRIu32, + major_rev, minor_rev, max_rev_full / 100, max_rev_full % 100); err = ESP_FAIL; } #endif diff --git a/components/esp_hw_support/port/esp32c3/Kconfig.hw_support b/components/esp_hw_support/port/esp32c3/Kconfig.hw_support index 332762e1fe..62cb8259df 100644 --- a/components/esp_hw_support/port/esp32c3/Kconfig.hw_support +++ b/components/esp_hw_support/port/esp32c3/Kconfig.hw_support @@ -57,7 +57,7 @@ config ESP_REV_MAX_FULL config ESP_EFUSE_BLOCK_REV_MIN_FULL int "Minimum Supported ESP32-C3 eFuse Block Revision" - default 100 + default 0 help Required minimum eFuse Block revision. ESP-IDF will check it at the 2nd bootloader stage whether the current image can work correctly for this eFuse Block revision. diff --git a/components/esp_hw_support/port/esp32s2/Kconfig.hw_support b/components/esp_hw_support/port/esp32s2/Kconfig.hw_support index ff19fab704..12141100da 100644 --- a/components/esp_hw_support/port/esp32s2/Kconfig.hw_support +++ b/components/esp_hw_support/port/esp32s2/Kconfig.hw_support @@ -45,7 +45,7 @@ config ESP_REV_MAX_FULL config ESP_EFUSE_BLOCK_REV_MIN_FULL int "Minimum Supported ESP32-S2 eFuse Block Revision" - default 2 + default 0 help Required minimum eFuse Block revision. ESP-IDF will check it at the 2nd bootloader stage whether the current image can work correctly for this eFuse Block revision.