Adjust LWMON environment to current requirements

in POST, EEPROM shows up on 8 addresses

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:
 ======================================================================

include/configs/lwmon.h

@@ -77,12 +77,12 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 #define	CONFIG_EXTRA_ENV_SETTINGS						\
-	"kernel_addr=40040000\0"						\
-	"ramdisk_addr=40100000\0"						\
+	"kernel_addr=40080000\0"						\
+	"ramdisk_addr=40280000\0"						\
 	"magic_keys=#3\0"							\
 	"key_magic#=28\0"							\
 	"key_cmd#=setenv addfb setenv bootargs \\$(bootargs) console=tty0\0"	\
-	"key_magic3=24\0"							\
+	"key_magic3=3C+3F\0"							\
 	"key_cmd3=echo *** Entering Test Mode ***;" \
 		"setenv add_misc setenv bootargs \\$(bootargs) testmode\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\0" \
@@ -92,9 +92,10 @@
 		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off " \
 		"panic=1\0"							\
 	"add_wdt=setenv bootargs $(bootargs) $(wdt_args)\0"			\
-	"flash_nfs=run nfsargs addip add_wdt addfb;"		\
+	"add_misc=setenv bootargs $(bootargs) runmode\0"			\
+	"flash_nfs=run nfsargs addip add_wdt addfb add_misc;"	\
 		"bootm $(kernel_addr)\0"					\
-	"flash_self=run ramargs addip add_wdt addfb;"		\
+	"flash_self=run ramargs addip add_wdt addfb add_misc;"	\
 		"bootm $(kernel_addr) $(ramdisk_addr)\0"			\
 	"net_nfs=tftp 100000 /tftpboot/pImage.lwmon;"		\
 		"run nfsargs addip add_wdt addfb;bootm\0"	\
@@ -277,7 +278,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 +291,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 +301,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

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__ */