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

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

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 3666bdbb7e9b98f66cbe6343e952e76c20869dea..4f83b1945d305ac0943c78a4031db34b090d949e 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -305,7 +305,6 @@
                               CFG_CMD_BEDBUG  | \
                               CFG_CMD_ELF | \
                               CFG_CMD_ASKENV  | \
-                              CFG_CMD_ECHO    | \
                               CFG_CMD_REGINFO | \
                               CFG_CMD_IMMAP   | \
                               CFG_CMD_MII)
@@ -330,6 +329,7 @@
 
 #define CONFIG_MPC8260      1   /* This is an MPC8260 CPU   */
 #define CONFIG_GW8260       1   /* on an GW8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>