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

[u-boot] / include / configs / TK885D.h

diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index c43fef68d4512c76f99eb5e46bca51beba9c948a..8073b7ec6e5e9de81c4e33404dc373a926e35a1a 100644 (file)
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -58,7 +58,7 @@
 #define CONFIG_BOARD_TYPES     1       /* support board types          */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -247,7 +247,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1
@@ -510,6 +510,8 @@
 #define CONFIG_FEC2_PHY        2
 #endif
 
+#define CONFIG_MII_INIT        1
+
 #define CONFIG_NET_RETRY_COUNT 3
 #define CONFIG_ETHPRIME                "FEC ETHERNET"