Merge branch 'master' of git://git.denx.de/u-boot-coldfire

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

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index d58f50848464cee465a7ff82906aec3cff79bb5f..40fef88f98e4a2834c05d28dcc0ae52dec7e9d85 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -52,6 +52,7 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
@@ -124,7 +125,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x0C00000       /* 4 ... 12 MB in DRAM  */
 
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK            /* no external serial clock used */
-#define CONFIG_SYS_IGNORE_405_UART_ERRATA_59   /* ignore ppc405gp errata #59   */
 #define CONFIG_SYS_BASE_BAUD       691200
 #define        CONFIG_UART1_CONSOLE            /* define for uart1 as console  */
 
@@ -156,7 +156,6 @@
  *-----------------------------------------------------------------------
  */
 #define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
-#define NAND_MAX_CHIPS          1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1         /* Max number of NAND devices */
 #define NAND_BIG_DELAY_US      25