From 5cf9da4821db0b6d86d8bbb74af86a0303063201 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 7 Nov 2003 13:42:26 +0000
Subject: * Patch by Bernhard Kuhn, 28 Oct 2003:   Add low boot support for
 MPC5200

* Fix problem with dual PCMCIA support (NSCU)

* Fix MPC5200 I2C initialization function
---
 board/icecube/config.mk | 17 +++++++++++++++--
 board/icecube/icecube.c |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'board/icecube')

diff --git a/board/icecube/config.mk b/board/icecube/config.mk
index 9913cfb486..07b5de1881 100644
--- 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 $(TOPDIR)/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
diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c
index 26cce5d0bc..1b69d1376f 100644
--- a/board/icecube/icecube.c
+++ b/board/icecube/icecube.c
@@ -134,7 +134,7 @@ long int initdram (int board_type)
 	*(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15);
 #endif
 
-#else
+#else	/* CFG_RAMBOOT */
 #ifdef CONFIG_MGT5100
 	*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */
 	dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15);
-- 
cgit v1.2.1