Skip to content

Commit

Permalink
Merge branch 'bugfix/psram_newlib_time_rom' into 'release/v4.4'
Browse files Browse the repository at this point in the history
rom: fix newlib time ROM functions being regardless of CONFIG_SPIRAM_CACHE_WORKAROUND (v4.4)

See merge request espressif/esp-idf!23003
  • Loading branch information
jack0c committed Apr 6, 2023
2 parents 599bc24 + 9acf0aa commit 173676e
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions components/esp_rom/component.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,20 @@ 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.
# Instead, those functions can be used from the toolchain by ESP-IDF.
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
Expand Down

0 comments on commit 173676e

Please sign in to comment.