diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-03-31 16:26:29 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-03-31 23:38:16 +0200 |
| commit | 3b258e2e58d7b5f45e03681b00df64fc8a61e9c1 (patch) | |
| tree | ed6383c4cdf87117b0760e2f267fac194b1cb320 /nand_spl/board/amcc/acadia/Makefile | |
| parent | b12fee010cff9738735e0f213205906ff68aead8 (diff) | |
| download | blackbird-obmc-uboot-3b258e2e58d7b5f45e03681b00df64fc8a61e9c1.tar.gz blackbird-obmc-uboot-3b258e2e58d7b5f45e03681b00df64fc8a61e9c1.zip | |
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/amcc/acadia/Makefile')
| -rw-r--r-- | nand_spl/board/amcc/acadia/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile index f4323d5086..84cb8ab651 100644 --- a/nand_spl/board/amcc/acadia/Makefile +++ b/nand_spl/board/amcc/acadia/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 = gpio.o nand_boot.o nand_ecc.o memory.o ndfc.o pll.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 \ $(nandobj)System.map |
