espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

rom: fix newlib time ROM functions being regardless of CONFIG_SPIRAM_CACHE_WORKAROUND

Browse Source 
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 33b3db35d7
commit e3d109dd1d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/esp_rom/component.mk
View File

@ -24,12 +24,6 @@ ifdef CONFIG_NEWLIB_NANO_FORMAT
LINKER_SCRIPTS += esp32.rom.newlib-nano.ld LINKER_SCRIPTS += esp32.rom.newlib-nano.ld
endif 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 ifndef CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
# If SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS option is defined # If SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS option is defined
# then all time functions from the ROM memory will not be linked. # 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 LINKER_SCRIPTS += esp32.rom.newlib-time.ld
endif 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 \ COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH)/esp32/ld \
$(addprefix -T ,$(LINKER_SCRIPTS)) \ $(addprefix -T ,$(LINKER_SCRIPTS)) \
-l$(COMPONENT_NAME) -Wl,--wrap=longjmp \ -l$(COMPONENT_NAME) -Wl,--wrap=longjmp \