Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / x600.h

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 89cd5016444b67cf91f46a5c408dc52f155af4e4..00b938a21601760eb4243f8e385180a5b06ca8fa 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -20,7 +20,6 @@
 #include <asm/arch/hardware.h>
 
 /* Timer, HZ specific defines */
-#define CONFIG_SYS_HZ                          1000
 #define CONFIG_SYS_HZ_CLOCK                    8300000
 
 #define        CONFIG_SYS_TEXT_BASE                    0x00800040
@@ -75,10 +74,9 @@
 /* Ethernet config options */
 #define CONFIG_MII
 #define CONFIG_DESIGNWARE_ETH
-#define CONFIG_DW_SEARCH_PHY
 #define CONFIG_NET_MULTI
+#define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
-#define CONFIG_DW_AUTONEG
 #define CONFIG_PHY_ADDR                0       /* PHY address */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */