diff --git a/components/bootloader/subproject/main/component.mk b/components/bootloader/subproject/main/component.mk index c41e8b7095..87e95520ae 100644 --- a/components/bootloader/subproject/main/component.mk +++ b/components/bootloader/subproject/main/component.mk @@ -17,7 +17,7 @@ ifdef CONFIG_IDF_TARGET_ESP32 ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH LINKER_SCRIPTS += $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.spiflash.ld endif - ifdef CONFIG_ESP32_REV_MIN_3 + ifeq ($(shell expr $(CONFIG_ESP32_REV_MIN_FULL) \>= 300), 1) LINKER_SCRIPTS += $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.eco3.ld endif endif diff --git a/components/esp_rom/component.mk b/components/esp_rom/component.mk index c68101573e..f6bcd22b7f 100644 --- a/components/esp_rom/component.mk +++ b/components/esp_rom/component.mk @@ -19,7 +19,7 @@ LINKER_SCRIPTS += esp32.rom.ld \ ifndef CONFIG_SPIRAM_CACHE_WORKAROUND LINKER_SCRIPTS += esp32.rom.newlib-funcs.ld -ifdef CONFIG_ESP32_REV_MIN_3 +ifeq ($(shell expr $(CONFIG_ESP32_REV_MIN_FULL) \>= 300), 1) LINKER_SCRIPTS += esp32.rom.eco3.ld endif diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild index 2311d7497d..6253414957 100644 --- a/components/esptool_py/Makefile.projbuild +++ b/components/esptool_py/Makefile.projbuild @@ -39,6 +39,9 @@ ifdef CONFIG_ESP32_REV_MIN ESPTOOL_ELF2IMAGE_OPTIONS += --min-rev $(CONFIG_ESP32_REV_MIN) endif +ESPTOOL_ELF2IMAGE_OPTIONS += --min-rev-full $(CONFIG_ESP_REV_MIN_FULL) +ESPTOOL_ELF2IMAGE_OPTIONS += --max-rev-full $(CONFIG_ESP_REV_MAX_FULL) + ifndef CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION ifndef IS_BOOTLOADER_BUILD ifdef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME