Merge with /home/sr/git/u-boot/cfi-flash

[oweals/u-boot.git] / include / configs / ISPAN.h

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 9ec1c0834b83eee12b82009be853d0492aa30b12..706bdb94f57ddd038ba9418b3a58c57a6e298b60 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -31,6 +31,7 @@
 
 #define CONFIG_MPC8260                 /* This is an MPC8260 CPU               */
 #define CONFIG_ISPAN                   /* ...on one of Interphase iSPAN boards */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /*-----------------------------------------------------------------------
  * Select serial console configuration
@@ -108,7 +109,6 @@
 #define CONFIG_COMMANDS                ( CONFIG_CMD_DFL  \
                                | CFG_CMD_ASKENV  \
                                | CFG_CMD_DHCP    \
-                               | CFG_CMD_ECHO    \
                                | CFG_CMD_IMMAP   \
                                | CFG_CMD_MII     \
                                | CFG_CMD_PING    \
@@ -177,8 +177,10 @@
 /* Environment is in flash, there is little space left in Serial EEPROM */
 #define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000         /* We use one complete sector   */
+#define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
+#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 
 /*-----------------------------------------------------------------------
  * Hard Reset Configuration Words