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
---
 include/asm-arm/u-boot-arm.h     |  1 -
 include/configs/VCMA9.h          |  1 +
 include/configs/at91rm9200dk.h   |  9 +++++++++
 include/configs/cogent_mpc8260.h |  1 +
 include/configs/cogent_mpc8xx.h  |  1 +
 include/configs/cradle.h         |  1 +
 include/configs/csb226.h         |  1 +
 include/configs/dnp1110.h        |  1 +
 include/configs/ep7312.h         |  1 +
 include/configs/impa7.h          |  1 +
 include/configs/innokom.h        |  1 +
 include/configs/lart.h           |  1 +
 include/configs/lubbock.h        |  1 +
 include/configs/lwmon.h          |  1 +
 include/configs/omap1510inn.h    |  7 +++++++
 include/configs/omap1610inn.h    | 14 ++++++++++----
 include/configs/shannon.h        |  1 +
 include/configs/smdk2400.h       |  1 +
 include/configs/smdk2410.h       |  1 +
 include/configs/trab.h           |  1 +
 include/configs/wepep250.h       |  7 +++++++
 21 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/asm-arm/u-boot-arm.h b/include/asm-arm/u-boot-arm.h
index 355b1e4..4c92b1f 100644
--- a/include/asm-arm/u-boot-arm.h
+++ b/include/asm-arm/u-boot-arm.h
@@ -35,7 +35,6 @@ extern ulong _armboot_end_data;	/* code + data end */
 extern ulong _armboot_end;	/* BSS end */
 extern ulong IRQ_STACK_START;	/* top of IRQ stack */
 extern ulong FIQ_STACK_START;	/* top of FIQ stack */
-extern ulong _armboot_real_end;	/* first usable RAM address */
 
 /* cpu/.../cpu.c */
 int	cpu_init(void);
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 9f868f8..8a09da6 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -97,6 +97,7 @@
  * Size of malloc() pool
  */
 #define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 #define CFG_MONITOR_LEN		(256 * 1024)
 #define CFG_MALLOC_LEN		(128 * 1024)
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 415b7fb..b092ec7 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -25,6 +25,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * If we are developing, we might want to start armboot from ram
+ * so we MUST NOT initialize critical regs like mem-timing ...
+ */
+#define CONFIG_INIT_CRITICAL            /* undef for developing */
+
 /* ARM asynchronous clock */
 #define AT91C_MAIN_CLOCK  179712000  /* from 18.432 MHz crystal (18432000 / 4 * 39) */
 #define AT91C_MASTER_CLOCK  59904000  /* peripheral clock (AT91C_MASTER_CLOCK / 3) */
@@ -40,7 +46,10 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN	(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
+
 #define CONFIG_BAUDRATE 115200
+
 /*
  * Hardware drivers
  */
diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 22d154e..d730527 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -160,6 +160,7 @@
 #define CFG_CMA_CONS_SERIAL	/* use Cogent motherboard serial for console */
 #endif
 #define CFG_CMA_LCD_HEARTBEAT	/* define for sec rotator in lcd corner */
+#define CONFIG_SHOW_ACTIVITY
 
 #if (CMA_MB_CAPS & CMA_MB_CAP_FLASH)
 /*
diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 2fd4037..51d4a7a 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -126,6 +126,7 @@
 #define CFG_CMA_CONS_SERIAL	/* use Cogent motherboard serial for console */
 #define CONFIG_CONS_INDEX	1
 #define CFG_CMA_LCD_HEARTBEAT	/* define for sec rotator in lcd corner */
+#define CONFIG_SHOW_ACTIVITY
 #if (CMA_MB_CAPS & CMA_MB_CAP_FLASH)
 /*
  * flash exists on the motherboard
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 13996d4..2cec4c7 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -47,6 +47,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 879607c..1b39d23 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -94,6 +94,7 @@
  *
  */
 #define CFG_MALLOC_LEN		(128*1024)
+#define CFG_GBL_DATA_SIZE	128		/* size in bytes reserved for initial data */
 
 #define CFG_LONGHELP				/* undef to save memory         */
 #define CFG_PROMPT		"uboot> "	/* Monitor Command Prompt       */
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 8594e65..f3a871b 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -47,6 +47,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 9a4c7e6..d9dd620 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -48,6 +48,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index fb35bd4..b4c1edf 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -48,6 +48,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index cfe9032..709c0d7 100644
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -87,6 +87,7 @@
  *
  */
 #define CFG_MALLOC_LEN		(256*1024)
+#define CFG_GBL_DATA_SIZE	128		/* size in bytes reserved for initial data */
 
 #define CFG_LONGHELP				/* undef to save memory         */
 #define CFG_PROMPT		"uboot> "	/* Monitor Command Prompt       */
diff --git a/include/configs/lart.h b/include/configs/lart.h
index 32153fc..c98f377 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -46,6 +46,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 609ce33..bfced44 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -52,6 +52,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN	    (CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 7451192..04215a6 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -113,6 +113,7 @@
 #undef	CFG_LOADS_BAUD_CHANGE		/* don't allow baudrate change	*/
 
 #define	CONFIG_WATCHDOG		1	/* watchdog enabled		*/
+#define	CFG_WATCHDOG_FREQ       (CFG_HZ / 20)
 
 #undef	CONFIG_STATUS_LED		/* Status LED disabled		*/
 
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 66a8b6b..845e4d2 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -27,6 +27,12 @@
 #define __CONFIG_H
 
 /*
+ * If we are developing, we might want to start armboot from ram
+ * so we MUST NOT initialize critical regs like mem-timing ...
+ */
+#define CONFIG_INIT_CRITICAL            /* undef for developing */
+
+/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -49,6 +55,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index d65e2a0..9bdd795 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -27,6 +27,12 @@
 #define __CONFIG_H
 
 /*
+ * If we are developing, we might want to start armboot from ram
+ * so we MUST NOT initialize critical regs like mem-timing ...
+ */
+#define CONFIG_INIT_CRITICAL            /* undef for developing */
+
+/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -50,6 +56,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN	(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
@@ -66,14 +73,13 @@
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
 #define CFG_NS16550_REG_SIZE	(-4)
-#define CFG_NS16550_CLK	(48000000)	/* can be 12M/32Khz or 48Mhz */
-#define CFG_NS16550_COM1	0xfffb0000	/* uart1, bluetooth uart
-						on helen */
+#define CFG_NS16550_CLK		(48000000)	/* can be 12M/32Khz or 48Mhz */
+#define CFG_NS16550_COM1	0xfffb0000	/* uart1, bluetooth uart on helen */
 
 /*
  * select serial console configuration
  */
-#define CONFIG_SERIAL1	1	/* we use SERIAL 1 on OMAP1610 Innovator */
+#define CONFIG_SERIAL1		1		/* we use SERIAL 1 on OMAP1610 Innovator */
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 77af2f3..7afe62d 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -52,6 +52,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index a557bc6..a7621a2 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -55,6 +55,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 0dcbbb0..7e3a02d 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -54,6 +54,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 4d37807..95ee37e 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -89,6 +89,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index ecb7215..a8a8ee5 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -23,6 +23,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * If we are developing, we might want to start armboot from ram
+ * so we MUST NOT initialize critical regs like mem-timing ...
+ */
+#define CONFIG_INIT_CRITICAL            /* undef for developing */
+
 #define CONFIG_PXA250          1        /* this is an PXA250 CPU     */
 #define CONFIG_WEPEP250        1        /* config for wepep250 board */
 #undef  CONFIG_USE_IRQ                  /* don't need use IRQ/FIQ    */
@@ -93,6 +99,7 @@
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 #define CFG_MALLOC_LEN	  (CFG_ENV_SIZE + (128<<10) )
+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */
 
-- 
cgit v1.1