From 288b3d7f5a54c987ecdfc5add4c7c25d36a9a3e1 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 20 Dec 2002 23:42:25 +0000
Subject: [PATCH] * Switch LWMON board default config from FRAM to EEPROM;   in
 POST, EEPROM shows up on 8 addresses

---
 CHANGELOG               |  7 +++++++
 include/configs/lwmon.h | 22 +++++++++++++++++++++-
 include/version.h       |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef6e0b3ecc..13ee632ad0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+======================================================================
+Changes since U-Boot 0.2.0:
+======================================================================
+
+* Switch LWMON board default config from FRAM to EEPROM;
+  in POST, EEPROM shows up on 8 addresses
+
 ======================================================================
 Changes for U-Boot 0.2.0:
 ======================================================================
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index d227fffae7..6ff64a3b91 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -277,7 +277,8 @@
 #define CFG_I2C_KEYBD_ADDR	0x56	/* PIC LWE keyboard			*/
 #define CFG_I2C_PICIO_ADDR	0x57	/* PIC IO Expander			*/
 
-#define CONFIG_USE_FRAM			/* Use FRAM instead of EEPROM	*/
+#undef	CONFIG_USE_FRAM			/* Use FRAM instead of EEPROM	*/
+
 #ifdef CONFIG_USE_FRAM	/* use FRAM */
 #define CFG_I2C_EEPROM_ADDR	0x55	/* FRAM FM24CL64		*/
 #define CFG_I2C_EEPROM_ADDR_LEN	2
@@ -289,6 +290,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS	4
 
 /* List of I2C addresses to be verified by POST */
+#ifdef CONFIG_USE_FRAM
 #define I2C_ADDR_LIST	{  /*	CFG_I2C_AUDIO_ADDR, */	\
 				CFG_I2C_SYSMON_ADDR,	\
 				CFG_I2C_RTC_ADDR,	\
@@ -298,6 +300,24 @@
 				CFG_I2C_PICIO_ADDR,	\
 				CFG_I2C_EEPROM_ADDR,	\
 			}
+#else	/* Use EEPROM - which show up on 8 consequtive addresses */
+#define I2C_ADDR_LIST	{  /*	CFG_I2C_AUDIO_ADDR, */	\
+				CFG_I2C_SYSMON_ADDR,	\
+				CFG_I2C_RTC_ADDR,	\
+				CFG_I2C_POWER_A_ADDR,	\
+				CFG_I2C_POWER_B_ADDR,	\
+				CFG_I2C_KEYBD_ADDR,	\
+				CFG_I2C_PICIO_ADDR,	\
+				CFG_I2C_EEPROM_ADDR+0,	\
+				CFG_I2C_EEPROM_ADDR+1,	\
+				CFG_I2C_EEPROM_ADDR+2,	\
+				CFG_I2C_EEPROM_ADDR+3,	\
+				CFG_I2C_EEPROM_ADDR+4,	\
+				CFG_I2C_EEPROM_ADDR+5,	\
+				CFG_I2C_EEPROM_ADDR+6,	\
+				CFG_I2C_EEPROM_ADDR+7,	\
+			}
+#endif	/* CONFIG_USE_FRAM */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
diff --git a/include/version.h b/include/version.h
index 5a95754697..b501028bd5 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.2.0"
+#define	U_BOOT_VERSION	"U-Boot 0.2.1"
 
 #endif	/* __VERSION_H__ */
-- 
2.39.2