You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/29 13:10:52 UTC
[incubator-nuttx] 01/08: lpc31xx/ea3131: Fix ld-locked.inc can't
find
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e006054dfc7080140f4f2e53151009561f41d65f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 29 10:53:12 2020 +0800
lpc31xx/ea3131: Fix ld-locked.inc can't find
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/lpc31xx/ea3131/locked/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/boards/arm/lpc31xx/ea3131/locked/Makefile b/boards/arm/lpc31xx/ea3131/locked/Makefile
index 1d2ecfb..6ca0978 100644
--- a/boards/arm/lpc31xx/ea3131/locked/Makefile
+++ b/boards/arm/lpc31xx/ea3131/locked/Makefile
@@ -53,11 +53,11 @@ PASS1_LINKLIBS += $(PASS1_LIBBOARD)
ifeq ($(WINTOOL),y)
# Windows-native toolchains
PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)staging"}"
- PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc}"
+ PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)lpc31xx$(DELIM)ea3131$(DELIM)locked$(DELIM)ld-locked.inc}"
else
# Linux/Cygwin-native toolchain
PASS1_LIBPATHS += -L"$(TOPDIR)$(DELIM)staging"
- PASS1_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc
+ PASS1_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)lpc31xx$(DELIM)ea3131$(DELIM)locked$(DELIM)ld-locked.inc
endif
PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT)
@@ -82,7 +82,7 @@ ld-locked.inc: mklocked.sh $(TOPDIR)$(DELIM).config
# is available to link against.
$(PASS1_LIBBOARD):
- $(Q) $(MAKE) -C $(TOPDIR)$(DELIM)boards$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C $(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)lpc31xx$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
# Create the locked.r file containing all of the code (except the start-up code)
# that needs to lie in the locked text region.