X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fmvgbe.h;h=1dc9bbea2f424ab23cece511f32abc0105045e02;hb=ae485b540f3b5555f5e043eaf2c8e859052f3b14;hp=8a466658e381b5c942b3a640bb7ca347ce9f5c95;hpb=e8f80a5a58c9b506453cc0780687e8ed457d30a6;p=u-boot

diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 8a466658e3..1dc9bbea2f 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -216,6 +216,7 @@
 
 /* SMI register fields */
 #define MVGBE_PHY_SMI_TIMEOUT		10000
+#define MVGBE_PHY_SMI_TIMEOUT_MS	1000
 #define MVGBE_PHY_SMI_DATA_OFFS		0	/* Data */
 #define MVGBE_PHY_SMI_DATA_MASK		(0xffff << MVGBE_PHY_SMI_DATA_OFFS)
 #define MVGBE_PHY_SMI_DEV_ADDR_OFFS	16	/* PHY device address */
@@ -291,17 +292,10 @@
 #define EBAR_TARGET_GUNIT			0x00000007
 
 /* Window attrib */
-#if defined(CONFIG_DOVE)
-#define EBAR_DRAM_CS0				0x00000000
-#define EBAR_DRAM_CS1				0x00000000
-#define EBAR_DRAM_CS2				0x00000000
-#define EBAR_DRAM_CS3				0x00000000
-#else
 #define EBAR_DRAM_CS0				0x00000E00
 #define EBAR_DRAM_CS1				0x00000D00
 #define EBAR_DRAM_CS2				0x00000B00
 #define EBAR_DRAM_CS3				0x00000700
-#endif
 
 /* DRAM Target interface */
 #define EBAR_DRAM_NO_CACHE_COHERENCY		0x00000000