diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-06 09:05:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:12:04 +0200 |
| commit | 2ae1824196884ba2bafffb7c0d3e8297350591e9 (patch) | |
| tree | 5af805bde716ea0438e9f39898e6cb4f7677f97a /board/amcc/canyonlands | |
| parent | 2bad5df7274dd2802ba9526ea7218e9c09d3f89c (diff) | |
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/canyonlands')
| -rw-r--r-- | board/amcc/canyonlands/config.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 9dd9c4bf8..abf2a2680 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2008 +# (C) Copyright 2008-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -24,12 +24,6 @@ # AMCC 460EX/460GT Evaluation Board (Canyonlands) board # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef CONFIG_SYS_TEXT_BASE -CONFIG_SYS_TEXT_BASE = 0xFFF80000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) @@ -40,6 +34,9 @@ ifeq ($(dbcr),1) PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000 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 |