From a8c7c708a9e0051c6358718c53572a4681eaa22b Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sat, 6 Dec 2003 19:49:23 +0000
Subject: * Patch by Gleb Natapov, 19 Sep 2003:   Move most of the timer
 interrupt related PPC code to ppc_lib/interrupts.c

* Patch by Anders Larsen, 17 Sep 2003:
  Bring ARM memory layout in sync with the documentation:
  stack and malloc-heap are now located _below_ the U-Boot code
---
 board/at91rm9200dk/config.mk |  2 +-
 board/cogent/lcd.c           | 14 ++++++++++++++
 board/cradle/config.mk       |  2 +-
 board/dnp1110/config.mk      |  4 ++--
 board/ep7312/config.mk       |  2 +-
 board/hymod/hymod.c          | 22 ++++++++++++++++++++++
 board/impa7/config.mk        |  2 +-
 board/lart/config.mk         |  4 ++--
 board/oxc/oxc.c              |  6 ++++++
 board/shannon/config.mk      |  4 ++--
 board/trab/config.mk         |  2 +-
 board/wepep250/wepep250.c    |  9 ---------
 12 files changed, 53 insertions(+), 20 deletions(-)

(limited to 'board')

diff --git a/board/at91rm9200dk/config.mk b/board/at91rm9200dk/config.mk
index 9ce161e55f..27cb3b123d 100644
--- a/board/at91rm9200dk/config.mk
+++ b/board/at91rm9200dk/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+TEXT_BASE = 0x21f80000
diff --git a/board/cogent/lcd.c b/board/cogent/lcd.c
index c1b4d116ea..814b4c80a0 100644
--- a/board/cogent/lcd.c
+++ b/board/cogent/lcd.c
@@ -229,3 +229,17 @@ lcd_heartbeat(void)
     if (++rotator_index >= (sizeof rotchars / sizeof rotchars[0]))
 	rotator_index = 0;
 }
+
+#ifdef CONFIG_SHOW_ACTIVITY
+void board_show_activity (ulong timestamp)
+{
+#ifdef CONFIG_STATUS_LED
+	if ((timestamp % (CFG_HZ / 2) == 0)
+		lcd_heartbeat ();
+#endif
+}
+
+void show_activity(int arg)
+{
+}
+#endif
diff --git a/board/cradle/config.mk b/board/cradle/config.mk
index 3ffcfe8444..aa40388811 100644
--- a/board/cradle/config.mk
+++ b/board/cradle/config.mk
@@ -1,2 +1,2 @@
-TEXT_BASE = 0xa0f08000
+TEXT_BASE = 0xa0f80000
 #TEXT_BASE = 0
diff --git a/board/dnp1110/config.mk b/board/dnp1110/config.mk
index 72ba595f1a..4f6af46f8c 100644
--- a/board/dnp1110/config.mk
+++ b/board/dnp1110/config.mk
@@ -11,7 +11,7 @@
 #
 # Linux-Kernel is expected to be at c000'8000, entry c000'8000
 #
-# we load ourself to c1f0'0000, the upper 1 MB of the first (only) bank
+# we load ourself to c1f8'0000, the upper 1 MB of the first (only) bank
 #
 
-TEXT_BASE = 0xc1f00000
+TEXT_BASE = 0xc1f80000
diff --git a/board/ep7312/config.mk b/board/ep7312/config.mk
index e1ba0e1798..0ae16a2efe 100644
--- a/board/ep7312/config.mk
+++ b/board/ep7312/config.mk
@@ -25,4 +25,4 @@
 # MA 02111-1307 USA
 #
 
-TEXT_BASE = 0xc0f00000
+TEXT_BASE = 0xc0f80000
diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index 3611a12977..dea0a70a23 100644
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -513,3 +513,25 @@ last_stage_init (void)
 
 	return (0);
 }
+
+#ifdef CONFIG_SHOW_ACTIVITY
+void board_show_activity (ulong timebase)
+{
+#ifdef CFG_HYMOD_DBLEDS
+	volatile immap_t *immr = (immap_t *) CFG_IMMR;
+	volatile iop8260_t *iop = &immr->im_ioport;
+	static int shift = 0;
+
+	if ((timestamp % CFG_HZ) == 0) {
+		if (++shift > 3)
+			shift = 0;
+		iop->iop_pdatd =
+				(iop->iop_pdatd & ~0x0f000000) | (1 << (24 + shift));
+	}
+#endif /* CFG_HYMOD_DBLEDS */
+}
+
+void show_activity(int arg)
+{
+}
+#endif /* CONFIG_SHOW_ACTIVITY */
diff --git a/board/impa7/config.mk b/board/impa7/config.mk
index 69b376c094..417d6a8e2c 100644
--- a/board/impa7/config.mk
+++ b/board/impa7/config.mk
@@ -25,4 +25,4 @@
 # MA 02111-1307 USA
 #
 
-TEXT_BASE = 0xc1700000
+TEXT_BASE = 0xc1780000
diff --git a/board/lart/config.mk b/board/lart/config.mk
index 8f1a62bbaa..3033c4fba6 100644
--- a/board/lart/config.mk
+++ b/board/lart/config.mk
@@ -14,10 +14,10 @@
 #
 # Linux-Kernel is expected to be at c000'8000, entry c000'8000
 #
-# we load ourself to c170'0000, the upper 1 MB of second bank
+# we load ourself to c178'0000, the upper 1 MB of second bank
 #
 # download areas is c800'0000
 #
 
 
-TEXT_BASE = 0xc1700000
+TEXT_BASE = 0xc1780000
diff --git a/board/oxc/oxc.c b/board/oxc/oxc.c
index 5f5e59a3ad..0d6fc8536c 100644
--- a/board/oxc/oxc.c
+++ b/board/oxc/oxc.c
@@ -156,6 +156,12 @@ void oxc_toggle_activeled(void)
 	ledtoggle++;
 }
 
+void board_show_activity (ulong timestamp)
+{
+	if ((timestamp % (CFG_HZ / 10)) == 0)
+		oxc_toggle_activeled ();
+}
+
 void show_activity(int arg)
 {
 	static unsigned char led = 0;
diff --git a/board/shannon/config.mk b/board/shannon/config.mk
index 736d3af623..ca45733af0 100644
--- a/board/shannon/config.mk
+++ b/board/shannon/config.mk
@@ -14,10 +14,10 @@
 #
 # Linux-Kernel is expected to be at c000'8000, entry c000'8000
 #
-# we load ourself to d830'0000, the upper 1 MB of the last (4th) bank
+# we load ourself to d838'0000, the upper 1 MB of the last (4th) bank
 #
 # download areas is c800'0000
 #
 
 
-TEXT_BASE = 0xd8300000
+TEXT_BASE = 0xd8380000
diff --git a/board/trab/config.mk b/board/trab/config.mk
index 2cb8edabf2..f2411d009c 100644
--- a/board/trab/config.mk
+++ b/board/trab/config.mk
@@ -22,5 +22,5 @@
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
-TEXT_BASE = 0x0DF00000
+TEXT_BASE = 0x0DF40000
 endif
diff --git a/board/wepep250/wepep250.c b/board/wepep250/wepep250.c
index 08b1bfde72..581818316e 100644
--- a/board/wepep250/wepep250.c
+++ b/board/wepep250/wepep250.c
@@ -40,15 +40,6 @@ int board_init( void ){
 #endif
   PSSR    = 0x20;
 
-/*
- * Following code is just bug workaround, remove it if not neccessary
- */
-
-  /* cpu/xscale/cpu.c do not set armboot_real_end that is used for
-     malloc pool.*/
-  if( _armboot_real_end == 0xbadc0de ){
-    _armboot_real_end = _armboot_end;
-  }
   return 0;
 }
 
-- 
cgit v1.2.1