Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / board / esd / du440 / config.mk

diff --git a/board/esd/du440/config.mk b/board/esd/du440/config.mk
index 51643345005f18f57033506d579b9b2e6f1bccb5..24f74e121330cfdd3f5ba4ff559a3a4a6bfff792 100644 (file)
--- a/board/esd/du440/config.mk
+++ b/board/esd/du440/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
@@ -20,11 +20,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
-endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
@@ -33,5 +28,5 @@ PLATFORM_CPPFLAGS += -DDEBUG
 endif
 
 ifeq ($(dbcr),1)
-PLATFORM_CPPFLAGS += -DCFG_INIT_DBCR=0x8cff0000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000
 endif