From 3b258e2e58d7b5f45e03681b00df64fc8a61e9c1 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 31 Mar 2011 16:26:29 -0500 Subject: 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 Signed-off-by: Scott Wood --- nand_spl/board/amcc/bamboo/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nand_spl/board/amcc/bamboo') diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index 15af860191..6430219411 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -24,6 +24,8 @@ 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) @@ -36,9 +38,7 @@ COBJS = nand_boot.o nand_ecc.o ndfc.o sdram.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) 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 -- cgit v1.2.1