Re: [U-Boot] [PATCH v2] Fix build issues cause by LDFLAGS_FINAL changes

2011-03-31 Thread Wolfgang Denk
Dear Scott Wood,

In message <20110331212629.ga17...@schlenkerla.am.freescale.net> you wrote:
> From: Wolfgang Denk 
> 
> 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 
> ---
> v2: Added da8xxevm, mx31pdk, p1_p2_rdb, tx25, smdk6400
> 
> Applied to u-boot-nand-flash
> 
>  nand_spl/board/amcc/acadia/Makefile   |6 +++---
>  nand_spl/board/amcc/bamboo/Makefile   |6 +++---
>  nand_spl/board/amcc/canyonlands/Makefile  |6 +++---
>  nand_spl/board/amcc/kilauea/Makefile  |6 +++---
>  nand_spl/board/amcc/sequoia/Makefile  |6 +++---
>  nand_spl/board/davinci/da8xxevm/Makefile  |6 +++---
>  nand_spl/board/freescale/mpc8313erdb/Makefile |6 +++---
>  nand_spl/board/freescale/mpc8315erdb/Makefile |6 +++---
>  nand_spl/board/freescale/mpc8536ds/Makefile   |6 +++---
>  nand_spl/board/freescale/mpc8569mds/Makefile  |6 +++---
>  nand_spl/board/freescale/mpc8572ds/Makefile   |6 +++---
>  nand_spl/board/freescale/mx31pdk/Makefile |6 +++---
>  nand_spl/board/freescale/p1_p2_rdb/Makefile   |6 +++---
>  nand_spl/board/karo/tx25/Makefile |6 +++---
>  nand_spl/board/samsung/smdk6400/Makefile  |6 +++---
>  nand_spl/board/sheldon/simpc8313/Makefile |6 +++---
>  16 files changed, 48 insertions(+), 48 deletions(-)

Applied to master, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
"(The  Chief  Programmer)  personally  defines  the  functional   and
performance  specifications, designs the program, codes it, tests it,
and writes its documentation... He  needs  great  talent,  ten  years
experience  and  considerable  systems  and  applications  knowledge,
whether in applied mathematics, business data handling, or whatever."
- Fred P. Brooks, _The Mythical Man Month_
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v2] Fix build issues cause by LDFLAGS_FINAL changes

2011-03-31 Thread Scott Wood
From: Wolfgang Denk 

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 
---
v2: Added da8xxevm, mx31pdk, p1_p2_rdb, tx25, smdk6400

Applied to u-boot-nand-flash

 nand_spl/board/amcc/acadia/Makefile   |6 +++---
 nand_spl/board/amcc/bamboo/Makefile   |6 +++---
 nand_spl/board/amcc/canyonlands/Makefile  |6 +++---
 nand_spl/board/amcc/kilauea/Makefile  |6 +++---
 nand_spl/board/amcc/sequoia/Makefile  |6 +++---
 nand_spl/board/davinci/da8xxevm/Makefile  |6 +++---
 nand_spl/board/freescale/mpc8313erdb/Makefile |6 +++---
 nand_spl/board/freescale/mpc8315erdb/Makefile |6 +++---
 nand_spl/board/freescale/mpc8536ds/Makefile   |6 +++---
 nand_spl/board/freescale/mpc8569mds/Makefile  |6 +++---
 nand_spl/board/freescale/mpc8572ds/Makefile   |6 +++---
 nand_spl/board/freescale/mx31pdk/Makefile |6 +++---
 nand_spl/board/freescale/p1_p2_rdb/Makefile   |6 +++---
 nand_spl/board/karo/tx25/Makefile |6 +++---
 nand_spl/board/samsung/smdk6400/Makefile  |6 +++---
 nand_spl/board/sheldon/simpc8313/Makefile |6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/nand_spl/board/amcc/acadia/Makefile 
b/nand_spl/board/amcc/acadia/Makefile
index f4323d5..84cb8ab 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
diff --git a/nand_spl/board/amcc/bamboo/Makefile 
b/nand_spl/board/amcc/bamboo/Makefile
index 15af860..6430219 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
 
diff --git a/nand_spl/board/amcc/canyonlands/Makefile 
b/nand_spl/board/amcc/canyonlands/Makefile
index 62c77d8..509a46e 100644
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/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)
@@ -41,9 +43,7 @@ COBJS += ndfc.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
 
diff --git a/nand_spl/board/amcc/kilauea/Makefile 
b/nand_spl/board/amcc/kilauea/Makefile
index 1053ce3..104b7e2 100644
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/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 = 44x_spd_ddr2.o nand_boot.o nand_ecc.o ndfc.o
 SRCS   := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS := $(SOBJS) $(COBJS)
-LNDIR  := $(