Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk
index c8566ecc7b6d32d6a5d74d5dce0c4ec1cbdd63a5..290415c9d0318f13802efe17223892cfd0c57668 100644 (file)
--- a/board/amcc/acadia/config.mk
+++ b/board/amcc/acadia/config.mk
@@ -21,8 +21,14 @@
 # MA 02111-1307 USA
 #
 
+#
+# AMCC 405EZ Reference Platform (Acadia) board
+#
+
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
+
 ifndef TEXT_BASE
-TEXT_BASE = 0xFFFC0000
+TEXT_BASE = 0xFFF80000
 endif
 
 ifeq ($(debug),1)