[U-Boot] [PATCH] ppc4xx: ppc440-generic-ALL: Fix out of tree build

[Ricardo Ribalda Delgado]

This patch solves the problems compiling ml507, v5fx30teval and
ppc440-generic out of tree.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at uam.es>
---
 Makefile                             |   49 +++++++++++++++++++++++-----------
 board/xilinx/ppc440-generic/Makefile |    4 +-
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index a342a88..c5ec313 100644
--- a/Makefile
+++ b/Makefile
@@ -1359,17 +1359,21 @@ ml300_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx
 
 ml507_flash_config: unconfig
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
 	@mkdir -p $(obj)include $(obj)board/xilinx/ml507
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" \
-		> $(obj)board/xilinx/ml507/config.mk
-	@echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ml507/config.mk
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+		> $(SRCTREE)/board/xilinx/ml507/config.mk
+	@echo "TEXT_BASE := 0xFE360000" \
+		>> $(SRCTREE)/board/xilinx/ml507/config.mk
 	@$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
 ml507_config: unconfig
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
 	@mkdir -p $(obj)include $(obj)board/xilinx/ml507
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" \
-		> $(obj)board/xilinx/ml507/config.mk
-	@echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ml507/config.mk
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+		> $(SRCTREE)/board/xilinx/ml507/config.mk
+	@echo "TEXT_BASE := 0x04000000"  \
+		>> $(SRCTREE)/board/xilinx/ml507/config.mk
 	@$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
 ocotea_config:	unconfig
@@ -1467,15 +1471,21 @@ taishan_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
 
 v5fx30teval_config: unconfig
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
 	@mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/avnet/v5fx30teval/config.mk
-	@echo "TEXT_BASE := 0x03000000" >> $(obj)board/avnet/v5fx30teval/config.mk
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+		> $(SRCTREE)/board/avnet/v5fx30teval/config.mk
+	@echo "TEXT_BASE := 0x03000000" \
+		>> $(SRCTREE)/board/avnet/v5fx30teval/config.mk
 	@$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
 
 v5fx30teval_flash_config: unconfig
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
 	@mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/avnet/v5fx30teval/config.mk
-	@echo "TEXT_BASE := 0xFF1C0000" >> $(obj)board/avnet/v5fx30teval/config.mk
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+		> $(SRCTREE)/board/avnet/v5fx30teval/config.mk
+	@echo "TEXT_BASE := 0xFF1C0000" \
+		>> $(SRCTREE)/board/avnet/v5fx30teval/config.mk
 	@$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
 
 VOH405_config:	unconfig
@@ -1497,15 +1507,19 @@ WUH405_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd
 
 xilinx-ppc440-generic_flash_config: unconfig
-	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/xilinx/ppc440-generic/config.mk
-	@echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ppc440-generic/config.mk
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
+		> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk
+	@echo "TEXT_BASE := 0xFE360000" \
+		>> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk
 	@$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
 
 xilinx-ppc440-generic_config: unconfig
-	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/
-	@echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/xilinx/ppc440-generic/config.mk
-	@echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ppc440-generic/config.mk
+	@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
+	@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
+		> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk
+	@echo "TEXT_BASE := 0x04000000" \
+		>> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk
 	@$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
 
 XPEDITE1K_config:	unconfig
@@ -3176,6 +3190,9 @@ clean:
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
 	       $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \
+	       $(SRCTREE)/board/xilinx/ml507/config.mk \
+	       $(SRCTREE)/board/xilinx/ppc440-generic/config.mk \
+	       $(SRCTREE)/board/avnet/v5fx30teval/config.mk \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile
index f7405a8..bf0a6ba 100644
--- a/board/xilinx/ppc440-generic/Makefile
+++ b/board/xilinx/ppc440-generic/Makefile
@@ -35,9 +35,9 @@ HOST_CFLAGS	+= $(INCS)
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	+= $(SRCTREE)/board/xilinx/ppc440-generic/xilinx_ppc440_generic.o
+COBJS	+= ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o
 
-SOBJS	+= $(SRCTREE)/board/xilinx/ppc440-generic/init.o
+SOBJS	+= ../../xilinx/ppc440-generic/init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
-- 
1.5.6.5