* Switch LWMON board default config from FRAM to EEPROM;

[karo-tx-uboot.git] / include / configs / lwmon.h

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index a89633abb0d07b9c92421f461de53368503cac0b..6ff64a3b91928b0ae3445f05cf005e89680fe639 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -31,11 +31,6 @@
 /* External logbuffer support */
 #define CONFIG_LOGBUFFER
 
-/* Reserve space for the logbuffer */
-#ifdef CONFIG_LOGBUFFER
-#define CONFIG_PRAM 20
-#endif
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -67,15 +62,16 @@
 #undef CONFIG_BOOTARGS
 
 /* POST support */
-#define CONFIG_POST            (CFG_POST_CACHE | \
+#define CONFIG_POST            (CFG_POST_CACHE    | \
                                 CFG_POST_WATCHDOG | \
-                                CFG_POST_RTC | \
-                                CFG_POST_MEMORY | \
-                                CFG_POST_CPU | \
-                                CFG_POST_UART | \
-                                CFG_POST_ETHER | \
-                                CFG_POST_SPI | \
-                                CFG_POST_USB | \
+                                CFG_POST_RTC      | \
+                                CFG_POST_MEMORY   | \
+                                CFG_POST_CPU      | \
+                                CFG_POST_UART     | \
+                                CFG_POST_ETHER    | \
+                                CFG_POST_I2C      | \
+                                CFG_POST_SPI      | \
+                                CFG_POST_USB      | \
                                 CFG_POST_SPR)
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
@@ -116,16 +112,11 @@
 #undef CONFIG_STATUS_LED               /* Status LED disabled          */
 
 /* enable I2C and select the hardware/software driver */
-#define CONFIG_HARD_I2C                1       /* I2C with hardware support    */
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
+#undef CONFIG_HARD_I2C                 /* I2C with hardware support    */
+#define        CONFIG_SOFT_I2C         1       /* I2C bit-banged               */
 
-#ifdef CONFIG_HARD_I2C
-/*
- * Hardware (CPM) I2C driver configuration
- */
-# define CFG_I2C_SPEED         93000   /* 93 kHz is supposed to work   */
-# define CFG_I2C_SLAVE         0xFE
-#endif /* CONFIG_HARD_I2C */
+#define CFG_I2C_SPEED          93000   /* 93 kHz is supposed to work   */
+#define CFG_I2C_SLAVE          0xFE
 
 #ifdef CONFIG_SOFT_I2C
 /*
@@ -286,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
@@ -297,6 +289,36 @@
 #endif /* CONFIG_USE_FRAM */
 #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,       \
+                               CFG_I2C_POWER_A_ADDR,   \
+                               CFG_I2C_POWER_B_ADDR,   \
+                               CFG_I2C_KEYBD_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
  */