alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

soc: move peripheral linker scripts out of target component

Browse Source
This commit is contained in:
SalimTerryLi 2021-07-21 21:09:45 +08:00
parent eef4c516ea
commit 2347e68e6b
No known key found for this signature in database
GPG Key ID: F05CCEF2191AF770
14 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/bootloader/subproject/main/component.mk
View File

@ -10,8 +10,7 @@ LINKER_SCRIPTS := \
$(COMPONENT_PATH)/ld/$(IDF_TARGET)/bootloader.rom.ld \
$(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.ld \
$(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.newlib-funcs.ld \
$(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.api.ld \
$(IDF_PATH)/components/$(IDF_TARGET)/ld/$(IDF_TARGET).peripherals.ld
$(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.api.ld
# SPI driver patch for ROM is only needed in ESP32
ifdef CONFIG_IDF_TARGET_ESP32

2
components/esp32/CMakeLists.txt
View File

@ -12,5 +12,3 @@ endif()
idf_component_register(INCLUDE_DIRS include
REQUIRES xtensa "${legacy_reqs}"
REQUIRED_IDF_TARGETS esp32)
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32.peripherals.ld")

3
components/esp32/component.mk
View File

@ -1,6 +1,3 @@
#
# Component Makefile
#
COMPONENT_ADD_LINKER_DEPS := $(COMPONENT_PATH) ld/esp32.peripherals.ld
COMPONENT_ADD_LDFLAGS := -T $(COMPONENT_PATH)/ld/esp32.peripherals.ld

2
components/esp32c3/CMakeLists.txt
View File

@ -11,5 +11,3 @@ endif()
idf_component_register(REQUIRES riscv "${legacy_reqs}"
REQUIRED_IDF_TARGETS esp32c3)
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32c3.peripherals.ld")

2
components/esp32h2/CMakeLists.txt
View File

@ -11,5 +11,3 @@ endif()
idf_component_register(REQUIRES riscv "${legacy_reqs}"
REQUIRED_IDF_TARGETS esp32h2)
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32h2.peripherals.ld")

2
components/esp32s2/CMakeLists.txt
View File

@ -11,5 +11,3 @@ endif()
idf_component_register(REQUIRES xtensa "${legacy_reqs}"
REQUIRED_IDF_TARGETS esp32s2)
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s2.peripherals.ld")

2
components/esp32s3/CMakeLists.txt
View File

@ -11,5 +11,3 @@ endif()
idf_component_register(REQUIRES xtensa "${legacy_reqs}"
REQUIRED_IDF_TARGETS esp32s3)
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s3.peripherals.ld")

2
components/soc/CMakeLists.txt
View File

@ -6,3 +6,5 @@ idf_component_register(SRCS "lldesc.c"
idf_build_get_property(target IDF_TARGET)
add_subdirectory(${target})
target_linker_script(${COMPONENT_LIB} INTERFACE "${target}/ld/${target}.peripherals.ld")

3
components/soc/component.mk
View File

@ -1,4 +1,7 @@
COMPONENT_SRCDIRS := . $(IDF_TARGET)
COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET) $(IDF_TARGET)/include
COMPONENT_ADD_LINKER_DEPS += $(COMPONENT_PATH) esp32/ld/esp32.peripherals.ld
COMPONENT_ADD_LDFLAGS += -T $(COMPONENT_PATH)/esp32/ld/esp32.peripherals.ld
COMPONENT_ADD_LDFRAGMENTS += linker.lf

0
components/esp32/ld/esp32.peripherals.ld → components/soc/esp32/ld/esp32.peripherals.ld
View File

0
components/esp32c3/ld/esp32c3.peripherals.ld → components/soc/esp32c3/ld/esp32c3.peripherals.ld
View File

0
components/esp32h2/ld/esp32h2.peripherals.ld → components/soc/esp32h2/ld/esp32h2.peripherals.ld
View File

0
components/esp32s2/ld/esp32s2.peripherals.ld → components/soc/esp32s2/ld/esp32s2.peripherals.ld
View File

0
components/esp32s3/ld/esp32s3.peripherals.ld → components/soc/esp32s3/ld/esp32s3.peripherals.ld
View File