This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit c7cf9fd9d26fb3695443439eda1cb817aba5acbd
Author: Eero Nurkkala <[email protected]>
AuthorDate: Wed Oct 13 17:12:22 2021 +0300

    mpfs: board Make.defs: add bootloader linker option
    
    Use the linker script used with bootloaders that start
    from the eNVM.
    
    Signed-off-by: Eero Nurkkala <[email protected]>
---
 boards/risc-v/mpfs/icicle/scripts/Make.defs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boards/risc-v/mpfs/icicle/scripts/Make.defs 
b/boards/risc-v/mpfs/icicle/scripts/Make.defs
index bdf6da1..e1ed0ca 100755
--- a/boards/risc-v/mpfs/icicle/scripts/Make.defs
+++ b/boards/risc-v/mpfs/icicle/scripts/Make.defs
@@ -22,7 +22,11 @@ include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include $(TOPDIR)/arch/risc-v/src/rv64gc/Toolchain.defs
 
-LDSCRIPT = ld.script
+ifeq ($(CONFIG_MPFS_BOOTLOADER),y)
+  LDSCRIPT = ld-envm.script
+else
+  LDSCRIPT = ld.script
+endif
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
   ARCHSCRIPT = -T "${shell cygpath -w 
$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}"

Reply via email to