aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-12-20 23:42:25 +0000
committerwdenk <wdenk>2002-12-20 23:42:25 +0000
commit288b3d7f5a54c987ecdfc5add4c7c25d36a9a3e1 (patch)
tree290ad6dd2df04cadf38a1600dbdd4f7269a2ee07
parent2f91a3d0f8a73665423eb6ab17689c67f05e0887 (diff)
downloadu-boot-linaro-stable-LABEL_2002_12_21_0040.tar.gz
* Switch LWMON board default config from FRAM to EEPROM;LABEL_2002_12_21_0040
in POST, EEPROM shows up on 8 addresses
-rw-r--r--CHANGELOG7
-rw-r--r--include/configs/lwmon.h22
-rw-r--r--include/version.h2
3 files changed, 29 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ef6e0b3ec..13ee632ad 100644
--- 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:
======================================================================
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index d227fffae..6ff64a3b9 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 5a9575469..b501028bd 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__ */