From e3d109dd1d7d1345cf070b5349dc37dd666a57ac Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Thu, 30 Mar 2023 16:19:38 +0800 Subject: [PATCH] rom: fix newlib time ROM functions being regardless of CONFIG_SPIRAM_CACHE_WORKAROUND On ESP32 ROM functions are not compatible with CONFIG_SPIRAM_CACHE_WORKAROUND. This were handled correctly in cmake, but not in make. --- components/esp_rom/component.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/components/esp_rom/component.mk b/components/esp_rom/component.mk index 7e7510c084..f48a7fce80 100644 --- a/components/esp_rom/component.mk +++ b/components/esp_rom/component.mk @@ -24,12 +24,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. @@ -37,6 +31,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)) \ -l$(COMPONENT_NAME) -Wl,--wrap=longjmp \