From 79659a0410fc113401ecd0c8a5bdd9a294ab4104 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Thu, 23 Feb 2023 01:45:21 +0800 Subject: [PATCH] chip_version: Updates for Make build system --- components/bootloader/subproject/main/component.mk | 2 +- components/esp_rom/component.mk | 2 +- components/esptool_py/Makefile.projbuild | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/bootloader/subproject/main/component.mk b/components/bootloader/subproject/main/component.mk index 29702b9175..f4b723a24e 100644 --- a/components/bootloader/subproject/main/component.mk +++ b/components/bootloader/subproject/main/component.mk @@ -18,7 +18,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 4f53003366..7e7510c084 100644 --- a/components/esp_rom/component.mk +++ b/components/esp_rom/component.mk @@ -15,7 +15,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