From 2ae1824196884ba2bafffb7c0d3e8297350591e9 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 6 Oct 2010 09:05:45 +0200 Subject: 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 --- board/amcc/kilauea/config.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'board/amcc/kilauea') diff --git a/board/amcc/kilauea/config.mk b/board/amcc/kilauea/config.mk index 17ef0d30ce..4ae3ea9265 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 -- cgit v1.2.3