summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-05-14 13:40:03 +0200
committerStefan Roese <sr@denx.de>2008-05-14 13:40:03 +0200
commit2dd7082e06d580404010b06fe4e0e8b7038a00c8 (patch)
tree3014edcfdb41d687486efa236e8f054b59671940
parent085551c05ca09e6c491ea11a1c6727a36776a545 (diff)
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>
-rw-r--r--board/amcc/canyonlands/config.mk10
1 files changed, 1 insertions, 9 deletions
diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk
index 1e4bbc47e68..2330cae925b 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)