Merge branch 'elf_reloc'

[oweals/u-boot.git] / board / amcc / bamboo / config.mk

diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk
index b6495de692cc4e16eb884f6e82cb3ccd788f2668..7ca16a06639bac7ff883831738959e59ae5677cd 100644 (file)
--- a/board/amcc/bamboo/config.mk
+++ b/board/amcc/bamboo/config.mk
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2002
+# (C) Copyright 2002-2010
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -21,8 +21,6 @@
 # MA 02111-1307 USA
 #
 
-TEXT_BASE = 0xFFF80000
-
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
 ifeq ($(debug),1)
@@ -30,9 +28,12 @@ PLATFORM_CPPFLAGS += -DDEBUG
 endif
 
 ifeq ($(dbcr),1)
-PLATFORM_CPPFLAGS += -DCFG_INIT_DBCR=0x8cff0000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000
 endif
 
-# legacy nand support
-BOARDLIBS = drivers/nand_legacy/libnand_legacy.a
-
+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