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

Merge branch 'bugfix/newlib_nano_lib_linking_v4.1' into 'release/v4.1'

Browse Source 
esp_rom: link newlib nano from ROM only if SPIRAM cache workaround is disabled (v4.1)

See merge request espressif/esp-idf!7544
This commit is contained in:
Angus Gratton
2020-02-11 11:56:11 +08:00
parent bdf8df61c0 1ae9541176
commit 901ae4d11c
2 changed files with 8 additions and 4 deletions
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. # 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") target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.newlib-funcs-time.ld")
endif() endif()
endif()
if(CONFIG_NEWLIB_NANO_FORMAT) # Include in newlib nano from ROM only if SPIRAM cache workaround is disabled
list(APPEND scripts "esp32/ld/esp32.rom.newlib-nano.ld") if(CONFIG_NEWLIB_NANO_FORMAT)
list(APPEND scripts "esp32/ld/esp32.rom.newlib-nano.ld")
endif()
endif() endif()
if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH) 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. #workaround is not enabled.
ifndef CONFIG_SPIRAM_CACHE_WORKAROUND ifndef CONFIG_SPIRAM_CACHE_WORKAROUND
LINKER_SCRIPTS += esp32.rom.newlib-funcs.ld 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 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 ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
LINKER_SCRIPTS += esp32.rom.spiflash.ld LINKER_SCRIPTS += esp32.rom.spiflash.ld
endif endif