From: Stefan Roese <sr@denx.de>
Date: Wed, 14 May 2008 11:40:03 +0000 (+0200)
Subject: ppc4xx: Fix bogus Canyonlands config.mk
X-Git-Tag: v1.3.3~10^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2dd7082e06d580404010b06fe4e0e8b7038a00c8;p=u-boot

ppc4xx: Fix bogus Canyonlands config.mk

This patch fixes the canyonlands config.mk file to enable correct
out-of-tree builds. Thanks to Wolfgang Denk for spotting this.

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk
index 1e4bbc47e6..2330cae925 100644
--- a/board/amcc/canyonlands/config.mk
+++ b/board/amcc/canyonlands/config.mk
@@ -24,20 +24,12 @@
 # AMCC 460EX/460GT Evaluation Board (Canyonlands) board
 #
 
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
 TEXT_BASE = 0xFFFA0000
 endif
 
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
-ifeq ($(CONFIG_PCIBOOT_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
 ifeq ($(debug),1)