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

[u-boot] / board / icecube / config.mk

diff --git a/board/icecube/config.mk b/board/icecube/config.mk
index 9913cfb486c698afb74102294dbb96b45e251a8f..170779d6c143485b193741c7f7d873c1c4b57360 100644 (file)
--- a/board/icecube/config.mk
+++ b/board/icecube/config.mk
@@ -22,10 +22,23 @@
 #
 
 #
-# IceCube board
+# IceCube board:
 #
+#      Valid values for TEXT_BASE are:
+#
+#      0xFFF00000   boot high (standard configuration)
+#      0xFF000000   boot low for 16 MiB boards
+#      0xFF800000   boot low for  8 MiB boards
+#      0x00100000   boot from RAM (for testing only)
+#
+
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
-TEXT_BASE = 0xfff00000
+ifndef TEXT_BASE
+## Standard: boot high
+TEXT_BASE = 0xFFF00000
+## For testing: boot from RAM
 # TEXT_BASE = 0x00100000
+endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board