summaryrefslogtreecommitdiff
path: root/board/amcc/kilauea
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-06 09:05:45 +0200
committerWolfgang Denk <wd@denx.de>2010-10-18 22:12:04 +0200
commit2ae1824196884ba2bafffb7c0d3e8297350591e9 (patch)
tree5af805bde716ea0438e9f39898e6cb4f7677f97a /board/amcc/kilauea
parent2bad5df7274dd2802ba9526ea7218e9c09d3f89c (diff)
downloadu-boot-imx-2ae1824196884ba2bafffb7c0d3e8297350591e9.zip
u-boot-imx-2ae1824196884ba2bafffb7c0d3e8297350591e9.tar.gz
u-boot-imx-2ae1824196884ba2bafffb7c0d3e8297350591e9.tar.bz2
Makefile: move all Power Architecture boards into boards.cfg
Clean up Makefile, and drop a lot of the config.mk files on the way. We now also automatically pick all boards that are listed in boards.cfg (and with all configurations), so we can drop the redundant entries from MAKEALL to avoid building these twice. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/amcc/kilauea')
-rw-r--r--board/amcc/kilauea/config.mk13
1 files changed, 5 insertions, 8 deletions
diff --git a/board/amcc/kilauea/config.mk b/board/amcc/kilauea/config.mk
index 17ef0d3..4ae3ea9 100644
--- a/board/amcc/kilauea/config.mk
+++ b/board/amcc/kilauea/config.mk
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2007
+# (C) Copyright 2007-2010
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
@@ -21,16 +21,13 @@
# MA 02111-1307 USA
#
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
-ifndef CONFIG_SYS_TEXT_BASE
-CONFIG_SYS_TEXT_BASE = 0xFFFA0000
-endif
-
ifeq ($(debug),1)
PLATFORM_CPPFLAGS += -DDEBUG
endif
-ifdef CONFIG_NAND_U_BOOT
+ifdef CONFIG_SYS_LDSCRIPT
+# need to strip off double quotes
+LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
+else ifdef CONFIG_NAND_U_BOOT
LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
endif