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

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

diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
index 28b9c6b4c7f01fa60323cb4b9107af5207ea0ef3..f71cdfbdd3cbbb46a1b48024e845e131ced8625c 100644 (file)
--- a/include/configs/zc5601.h
+++ b/include/configs/zc5601.h
@@ -11,11 +11,9 @@
 
 
 #define CONFIG_MXC_UART_BASE   UART2_BASE
-#define CONFIG_CONSOLE_DEV             "ttymxc1"
+#define CONSOLE_DEV            "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p1"
 
-#define CONFIG_DEFAULT_FDT_FILE        "imx6q-zc5601.dtb"
-
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #include "el6x_common.h"
@@ -27,7 +25,6 @@
 #define CONFIG_FEC_XCV_TYPE                    RGMII
 #define CONFIG_ETHPRIME                                "FEC"
 #define CONFIG_FEC_MXC_PHYADDR                 0x10
-#define CONFIG_PHYLIB
 #define CONFIG_FEC_FIXED_SPEED                 1000 /* No autoneg, fix Gb */
 
 #endif                         /*__EL6Q_CONFIG_H */