From: wdenk <wdenk>
Date: Sun, 17 Dec 2000 18:24:50 +0000 (+0000)
Subject: * For IP860, set SRAM information in bd_info
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f335a1e7ee271409ecf474faa39c09c28989027b;p=users%2Frw%2Fppcboot.git

* For IP860, set SRAM information in bd_info
* Fix FADS860T configuration
---

diff --git a/CHANGELOG b/CHANGELOG
index 42bcfac..4375d5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,14 @@ To do:
 * "last user address" is set even if bootp is used without parameters
   (and it uses default address).
 
+======================================================================
+Modifications since 0.7.0:
+======================================================================
+
+* For IP860, set SRAM information in bd_info
+
+* Fix FADS860T configuration
+
 ======================================================================
 Modifications for 0.7.0:
 ======================================================================
diff --git a/README b/README
index 5527e04..12bc964 100644
--- a/README
+++ b/README
@@ -653,10 +653,10 @@ initrd_high	- restrict positioning of initrd images:
                   does not overwrite the PCBoot stack and data).
 
                   For instance, when you have a system with 16 MB
-                  RAM, and want to resever 4 MB from use by Linux,
+                  RAM, and want to reseve 4 MB from use by Linux,
                   you can do this by adding "mem=12M" to the value of
                   the "bootargs" variable. However, now you must make
-                  sure, that the initrd image is placed in t he first
+                  sure, that the initrd image is placed in the first
                   12 MB as well - this can be done with
 
 		  setenv initrd_high 00c00000
diff --git a/common/board.c b/common/board.c
index 5313ce5..4f15d80 100644
--- a/common/board.c
+++ b/common/board.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <devices.h>
+#include <mpc8xx.h>
 #if (CONFIG_COMMANDS & CFG_CMD_IDE)
 #include <ide.h>
 #endif
@@ -264,8 +265,13 @@ board_init_f (ulong bootflag)
     bd->bi_flashoffset = 0;
 #endif
 
+#ifdef CONFIG_IP860
+    bd->bi_sramstart   = SRAM_BASE;	  /* start of  SRAM memory		*/
+    bd->bi_sramsize    = SRAM_SIZE;	  /* size  of  SRAM memory		*/
+#else
     bd->bi_sramstart   = 0; /* FIXME */	  /* start of  SRAM memory		*/
     bd->bi_sramsize    = 0; /* FIXME */	  /* size  of  SRAM memory		*/
+#endif
 
 #if defined(CONFIG_8xx) || defined(CONFIG_8260)
     bd->bi_immr_base   = CFG_IMMR;	  /* base  of IMMR register		*/
diff --git a/include/config_FADS860T.h b/include/config_FADS860T.h
index 2f4b126..a28cdd4 100644
--- a/include/config_FADS860T.h
+++ b/include/config_FADS860T.h
@@ -160,6 +160,8 @@
 #define CFG_ENV_OFFSET		0x00040000
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/
 
+#define CFG_ENV_SECT_SIZE	0x40000	/* see README - env sector total size	*/
+
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
diff --git a/include/config_IP860.h b/include/config_IP860.h
index b03aed2..5812335 100644
--- a/include/config_IP860.h
+++ b/include/config_IP860.h
@@ -313,6 +313,7 @@
 #define	SRAM_BASE	0x20000000
 #define CFG_OR3		0xFFF00130		/* BI/SCY = 5/TRLX (internal) */
 #define CFG_BR3		((SRAM_BASE & BR_BA_MSK) | BR_PS_16 | BR_V)
+#define SRAM_SIZE	(1 + (~(CFG_OR3 & BR_BA_MSK)))
 
 /*
  * BR4/OR4 - Board Control & Status (8 bit)