* Switch LWMON board default config from FRAM to EEPROM; LABEL_2002_12_21_0040
authorwdenk <wdenk>
Fri, 20 Dec 2002 23:42:25 +0000 (23:42 +0000)
committerwdenk <wdenk>
Fri, 20 Dec 2002 23:42:25 +0000 (23:42 +0000)
  in POST, EEPROM shows up on 8 addresses

CHANGELOG
include/configs/lwmon.h
include/version.h

index ef6e0b3..13ee632 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
 ======================================================================
 ======================================================================
+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:
 ======================================================================
 
 Changes for U-Boot 0.2.0:
 ======================================================================
 
index d227fff..6ff64a3 100644 (file)
 #define CFG_I2C_KEYBD_ADDR     0x56    /* PIC LWE keyboard                     */
 #define CFG_I2C_PICIO_ADDR     0x57    /* PIC IO Expander                      */
 
 #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
 #ifdef CONFIG_USE_FRAM /* use FRAM */
 #define CFG_I2C_EEPROM_ADDR    0x55    /* FRAM FM24CL64                */
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 
 /* List of I2C addresses to be verified by POST */
 #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,       \
 #define I2C_ADDR_LIST  {  /*   CFG_I2C_AUDIO_ADDR, */  \
                                CFG_I2C_SYSMON_ADDR,    \
                                CFG_I2C_RTC_ADDR,       \
                                CFG_I2C_PICIO_ADDR,     \
                                CFG_I2C_EEPROM_ADDR,    \
                        }
                                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
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
index 5a95754..b501028 100644 (file)
@@ -24,6 +24,6 @@
 #ifndef        __VERSION_H__
 #define        __VERSION_H__
 
 #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__ */
 
 #endif /* __VERSION_H__ */