diff --git a/components/esp_rom/component.mk b/components/esp_rom/component.mk index f6bcd22b7f..f2cbf5e500 100644 --- a/components/esp_rom/component.mk +++ b/components/esp_rom/component.mk @@ -28,12 +28,6 @@ ifdef CONFIG_NEWLIB_NANO_FORMAT LINKER_SCRIPTS += esp32.rom.newlib-nano.ld endif -endif #CONFIG_SPIRAM_CACHE_WORKAROUND - -ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH -LINKER_SCRIPTS += esp32.rom.spiflash.ld -endif - ifndef CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS # If SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS option is defined # then all time functions from the ROM memory will not be linked. @@ -41,6 +35,13 @@ ifndef CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS LINKER_SCRIPTS += esp32.rom.newlib-time.ld endif +endif #CONFIG_SPIRAM_CACHE_WORKAROUND + +ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH +LINKER_SCRIPTS += esp32.rom.spiflash.ld +endif + + COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH)/esp32/ld \ $(addprefix -T ,$(LINKER_SCRIPTS)) ifndef IS_BOOTLOADER_BUILD