This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 19c1d86a1696dbf7e20c29dc31441b9e61849ade Author: Filipe Cavalcanti <[email protected]> AuthorDate: Wed Apr 8 21:36:46 2026 -0300 boards/risc-v: fix LD_SCRIPTS manipulation on CMake for Espressif devices Changes the global property manipulation of LD_SCRIPTS to APPEND. This avoids rewriting this global property. Signed-off-by: Filipe Cavalcanti <[email protected]> --- boards/risc-v/esp32c3/esp32-c3-zero/src/CMakeLists.txt | 2 +- boards/risc-v/esp32c3/esp32c3-devkit/src/CMakeLists.txt | 2 +- boards/risc-v/esp32c3/esp32c3-xiao/src/CMakeLists.txt | 2 +- boards/risc-v/esp32c6/esp32c6-devkitc/src/CMakeLists.txt | 2 +- boards/risc-v/esp32c6/esp32c6-devkitm/src/CMakeLists.txt | 2 +- boards/risc-v/esp32c6/esp32c6-xiao/src/CMakeLists.txt | 2 +- boards/risc-v/esp32h2/esp32h2-devkit/src/CMakeLists.txt | 2 +- boards/risc-v/esp32p4/esp32p4-function-ev-board/src/CMakeLists.txt | 2 +- boards/risc-v/esp32p4/esp32p4-pico-wifi-wareshare/src/CMakeLists.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards/risc-v/esp32c3/esp32-c3-zero/src/CMakeLists.txt b/boards/risc-v/esp32c3/esp32-c3-zero/src/CMakeLists.txt index 1e196ca2831..315fae8352f 100644 --- a/boards/risc-v/esp32c3/esp32-c3-zero/src/CMakeLists.txt +++ b/boards/risc-v/esp32c3/esp32-c3-zero/src/CMakeLists.txt @@ -63,4 +63,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/CMakeLists.txt b/boards/risc-v/esp32c3/esp32c3-devkit/src/CMakeLists.txt index e4db5a7c0d5..9377e66016b 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/src/CMakeLists.txt +++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/CMakeLists.txt @@ -63,4 +63,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32c3/esp32c3-xiao/src/CMakeLists.txt b/boards/risc-v/esp32c3/esp32c3-xiao/src/CMakeLists.txt index 37011de0ac2..dc938b949b7 100644 --- a/boards/risc-v/esp32c3/esp32c3-xiao/src/CMakeLists.txt +++ b/boards/risc-v/esp32c3/esp32c3-xiao/src/CMakeLists.txt @@ -59,4 +59,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/src/CMakeLists.txt b/boards/risc-v/esp32c6/esp32c6-devkitc/src/CMakeLists.txt index f29d24ac270..ca868903619 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkitc/src/CMakeLists.txt +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/CMakeLists.txt @@ -59,4 +59,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32c6/esp32c6-devkitm/src/CMakeLists.txt b/boards/risc-v/esp32c6/esp32c6-devkitm/src/CMakeLists.txt index f25cfebcbed..5228c69d97d 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkitm/src/CMakeLists.txt +++ b/boards/risc-v/esp32c6/esp32c6-devkitm/src/CMakeLists.txt @@ -59,4 +59,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32c6/esp32c6-xiao/src/CMakeLists.txt b/boards/risc-v/esp32c6/esp32c6-xiao/src/CMakeLists.txt index 89819ef5751..458dea794c7 100644 --- a/boards/risc-v/esp32c6/esp32c6-xiao/src/CMakeLists.txt +++ b/boards/risc-v/esp32c6/esp32c6-xiao/src/CMakeLists.txt @@ -59,4 +59,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32h2/esp32h2-devkit/src/CMakeLists.txt b/boards/risc-v/esp32h2/esp32h2-devkit/src/CMakeLists.txt index b2c9ed76ebd..44594ca44bc 100644 --- a/boards/risc-v/esp32h2/esp32h2-devkit/src/CMakeLists.txt +++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/CMakeLists.txt @@ -59,4 +59,4 @@ else() "${BOARD_COMMON_DIR}/scripts/${CHIP_SERIES}_legacy_sections.ld") endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/src/CMakeLists.txt b/boards/risc-v/esp32p4/esp32p4-function-ev-board/src/CMakeLists.txt index 35bfaa2ed47..da332467cbb 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/src/CMakeLists.txt +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/src/CMakeLists.txt @@ -61,4 +61,4 @@ if(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT OR CONFIG_ESPRESSIF_SIMPLE_BOOT) endif() endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS}) diff --git a/boards/risc-v/esp32p4/esp32p4-pico-wifi-wareshare/src/CMakeLists.txt b/boards/risc-v/esp32p4/esp32p4-pico-wifi-wareshare/src/CMakeLists.txt index 3c4989a3127..8e3313eb340 100644 --- a/boards/risc-v/esp32p4/esp32p4-pico-wifi-wareshare/src/CMakeLists.txt +++ b/boards/risc-v/esp32p4/esp32p4-pico-wifi-wareshare/src/CMakeLists.txt @@ -61,4 +61,4 @@ if(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT OR CONFIG_ESPRESSIF_SIMPLE_BOOT) endif() endif() -set_property(GLOBAL PROPERTY LD_SCRIPT ${LDSCRIPTS}) +set_property(GLOBAL APPEND PROPERTY LD_SCRIPT ${LDSCRIPTS})
