aboutsummaryrefslogtreecommitdiff
path: root/nand_spl/board/karo/tx25
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-31 16:26:29 -0500
committerWolfgang Denk <wd@denx.de>2011-03-31 23:38:16 +0200
commit3b258e2e58d7b5f45e03681b00df64fc8a61e9c1 (patch)
treeed6383c4cdf87117b0760e2f267fac194b1cb320 /nand_spl/board/karo/tx25
parentb12fee010cff9738735e0f213205906ff68aead8 (diff)
downloadu-boot-linaro-stable-3b258e2e58d7b5f45e03681b00df64fc8a61e9c1.tar.gz
Fix build issues cause by LDFLAGS_FINAL changes
Commit 6dc1ece "Introduce a new linker flag LDFLAGS_FINAL" modified a number of Makefiles in a way that broke out-of-tree builds. The problem was that $(nandobj) was used before it got defined. Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'nand_spl/board/karo/tx25')
-rw-r--r--nand_spl/board/karo/tx25/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile
index 35978e0ab..8bc54d11b 100644
--- a/nand_spl/board/karo/tx25/Makefile
+++ b/nand_spl/board/karo/tx25/Makefile
@@ -24,6 +24,8 @@ CONFIG_NAND_SPL = y
include $(TOPDIR)/config.mk
include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
+nandobj := $(OBJTREE)/nand_spl/
+
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL)
@@ -38,9 +40,7 @@ SRCS += $(SRCTREE)/arch/arm/cpu/arm926ejs/start.S
SRCS += $(SRCTREE)/board/karo/tx25/lowlevel_init.S
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS)
-LNDIR := $(OBJTREE)/nand_spl/board/$(BOARDDIR)
-
-nandobj := $(OBJTREE)/nand_spl/
+LNDIR := $(nandobj)board/$(BOARDDIR)
ALL = $(nandobj)u-boot-spl $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin