Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / sbc405.h

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index d93ca2d..242f42f 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -58,9 +58,11 @@
 #define CONFIG_BOOTCOMMAND      "version;echo;tftpboot ${loadaddr} ${loadfile};bootvx"      /* autoboot command     */
 
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY_RESET_DELAY 300     /* Intel LXT971A needs this     */
+#define CONFIG_NET_MULTI
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootargs=emac(0,0)host:/T221ppc/target/config/sbc405/vxWorks.st " \
@@ -146,7 +148,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
 
 /* The following table includes the supported baudrates */