diff options
Diffstat (limited to 'board/amcc/bamboo/config.mk')
| -rw-r--r-- | board/amcc/bamboo/config.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk index cdf8f11..7ca16a0 100644 --- a/board/amcc/bamboo/config.mk +++ b/board/amcc/bamboo/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2002-2007 +# (C) Copyright 2002-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,12 +21,6 @@ # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef CONFIG_SYS_TEXT_BASE -CONFIG_SYS_TEXT_BASE = 0xFFFA0000 -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) @@ -37,6 +31,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 |