summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-09-10 18:20:28 +0000
committerwdenk <wdenk>2003-09-10 18:20:28 +0000
commit149dded2b178bc0fb62cb6f61b87968d914b580a (patch)
tree6322023840b11a7210e3030262dc5e6ee42953f0 /cpu/ppc4xx
parent7152b1d0b3f8beec8c297d64664e41b4c4ef610a (diff)
downloadu-boot-imx-149dded2b178bc0fb62cb6f61b87968d914b580a.zip
u-boot-imx-149dded2b178bc0fb62cb6f61b87968d914b580a.tar.gz
u-boot-imx-149dded2b178bc0fb62cb6f61b87968d914b580a.tar.bz2
* Add support for USB Mass Storage Devices (BBB)
(tested with USB memory sticks only) * Avoid flicker on TRAB's VFD
Diffstat (limited to 'cpu/ppc4xx')
-rw-r--r--cpu/ppc4xx/405gp_enet.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpu/ppc4xx/405gp_enet.c b/cpu/ppc4xx/405gp_enet.c
index 9639c92..c222c71 100644
--- a/cpu/ppc4xx/405gp_enet.c
+++ b/cpu/ppc4xx/405gp_enet.c
@@ -83,7 +83,7 @@
#if defined(CONFIG_405GP) || defined(CONFIG_440) || defined(CONFIG_405EP)
#define EMAC_RESET_TIMEOUT 1000 /* 1000 ms reset timeout */
-#define PHY_AUTONEGOTIATE_TIMEOUT 2000 /* 2000 ms autonegotiate timeout */
+#define PHY_AUTONEGOTIATE_TIMEOUT 4000 /* 4000 ms autonegotiate timeout */
#define NUM_TX_BUFF 1
/* AS.HARNOIS
@@ -271,18 +271,18 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
puts ("Waiting for PHY auto negotiation to complete");
i = 0;
while (!(reg_short & PHY_BMSR_AUTN_COMP)) {
- if ((i++ % 100) == 0)
- putc ('.');
- udelay (10000); /* 10 ms */
- miiphy_read (CONFIG_PHY_ADDR, PHY_BMSR, &reg_short);
-
/*
* Timeout reached ?
*/
- if (i * 10 > PHY_AUTONEGOTIATE_TIMEOUT) {
+ if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
puts (" TIMEOUT !\n");
break;
}
+
+ if ((i++ % 1000) == 0)
+ putc ('.');
+ udelay (1000); /* 1 ms */
+ miiphy_read (CONFIG_PHY_ADDR, PHY_BMSR, &reg_short);
}
puts (" done\n");
udelay (500000); /* another 500 ms (results in faster booting) */