Merge branch 'bugfix/psram_newlib_time_rom_v4.2' into 'release/v4.2'

rom: fix newlib time ROM functions being regardless of CONFIG_SPIRAM_CACHE_WORKAROUND (v4.2)

See merge request espressif/esp-idf!23392

components/esp_rom/component.mk

@@ -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 \