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.
This commit is contained in:
Marius Vikhammer 2023-03-30 16:19:38 +08:00 committed by BOT
parent 3d0cfc8cc3
commit 6a3bd9e22b

View File

@ -20,12 +20,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.
@ -33,6 +27,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_SRCDIRS := patches
COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH)/esp32/ld \