From e0ac62d798ce60ec5d43125d4786e58b0d881836 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 17 Aug 2003 18:55:18 +0000
Subject: * Make Ethernet autonegotiation on INCA-IP work for all clock rates; 
  allow selection of clock frequency as "make" target

* Implement memory autosizing code for IceCube boards

* Configure network port on INCA-IP for autonegotiation

* Fix overflow problem in network timeout code

* Patch by Richard Woodruff, 8 Aug 2003:
  Allow crc32 to be used at address 0x000 (crc32_no_comp, too).
---
 include/configs/IceCube.h | 3 +++
 include/configs/incaip.h  | 2 ++
 include/version.h         | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index bf09b01a29..6a43441a36 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -131,6 +131,9 @@
  */
 #define CFG_MBAR		0xf0000000
 #define CFG_SDRAM_BASE		0x00000000
+#ifdef CONFIG_MPC5200
+#define CFG_DEFAULT_MBAR	0x80000000
+#endif
 
 /* Use SRAM until RAM will be available */
 #define CFG_INIT_RAM_ADDR	MPC5XXX_SRAM
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index b17d7f34e8..99e7868f9c 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -31,8 +31,10 @@
 #define CONFIG_MIPS32		1	/* MIPS 4Kc CPU core	*/
 #define CONFIG_INCA_IP		1	/* on a INCA-IP Board	*/
 
+#ifndef	CPU_CLOCK_RATE
 /* allowed values: 100000000, 133000000, and 150000000 */
 #define CPU_CLOCK_RATE	133000000	/* 133 MHz clock for the MIPS core */
+#endif
 
 #if CPU_CLOCK_RATE == 100000000
 #define INFINEON_EBU_BOOTCFG	0x20C4	/* CMULT = 4 for 100 MHz */
diff --git a/include/version.h b/include/version.h
index e3ce8be3b3..5ba84884c2 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,6 @@
 #ifndef	__VERSION_H__
 #define	__VERSION_H__
 
-#define	U_BOOT_VERSION	"U-Boot 0.4.5"
+#define	U_BOOT_VERSION	"U-Boot 0.4.6"
 
 #endif	/* __VERSION_H__ */
-- 
cgit