Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp_rom: link newlib nano from ROM only if SPIRAM cache workaround is disabled

Browse source
This commit is contained in:
Mahavir Jain 2020-02-07 16:05:37 +05:30
parent 5799999e41
commit 1ae9541176
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/esp_rom/CMakeLists.txt
View file

@ -30,10 +30,12 @@ else() # Regular app build
# Instead, those functions can be used from the toolchain by ESP-IDF.
target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.newlib-funcs-time.ld")
endif()
endif()
if(CONFIG_NEWLIB_NANO_FORMAT)
list(APPEND scripts "esp32/ld/esp32.rom.newlib-nano.ld")
# Include in newlib nano from ROM only if SPIRAM cache workaround is disabled
if(CONFIG_NEWLIB_NANO_FORMAT)
list(APPEND scripts "esp32/ld/esp32.rom.newlib-nano.ld")
endif()
endif()
if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH)

4
components/esp_rom/component.mk
View file

@ -10,12 +10,14 @@ LINKER_SCRIPTS += esp32.rom.ld \
#workaround is not enabled.
ifndef CONFIG_SPIRAM_CACHE_WORKAROUND
LINKER_SCRIPTS += esp32.rom.newlib-funcs.ld
endif
# Include in newlib nano from ROM only if SPIRAM cache workaround is disabled
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