summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-03-23 23:20:24 +0000
committerwdenk <wdenk>2004-03-23 23:20:24 +0000
commit6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 (patch)
treec984d6e17157fb9400abc0c50e4e5ac19eb4316d /common
parenteeb1b77b7d994b2fde385d5b90bb1abfc0ba3bee (diff)
downloadu-boot-imx-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.zip
u-boot-imx-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.tar.gz
u-boot-imx-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.tar.bz2
* Patch by Stephen Williams, 19 March 2004
Increase speed of sector reads from SystemACE, shorten poll timeout and remove a useless reset * Patch by Tolunay Orkun, 19 Mar 2004: Make GigE PHY 1000Mbps Speed/Duplex detection conditional (CONFIG_PHY_GIGE) * Patch by Brad Kemp, 18 Mar 2004: prevent machine checks during a PCI scan * Patch by Pierre Aubert, 18 Mar 2004: Fix string cleaning in IDE identification
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ace.c5
-rw-r--r--common/cmd_ide.c2
-rw-r--r--common/miiphyutil.c5
3 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_ace.c b/common/cmd_ace.c
index b6f8604..3512a15 100644
--- a/common/cmd_ace.c
+++ b/common/cmd_ace.c
@@ -190,16 +190,13 @@ static unsigned long systemace_read(int dev,
/* Write sector count | ReadMemCardData. */
ace_writew((trans&0xff) | 0x0300, 0x14);
- /* CONTROLREG = CFGRESET|LOCKREQ */
- ace_writew(0x0082, 0x18);
-
retry = trans * 16;
while (retry > 0) {
int idx;
/* Wait for buffer to become ready. */
while (! (ace_readw(0x04) & 0x0020)) {
- udelay(1000);
+ udelay(100);
}
/* Read 16 words of 2bytes from the sector buffer. */
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 3bed194..842a2fd 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -1417,7 +1417,7 @@ static void ident_cpy (unsigned char *dst, unsigned char *src, unsigned int len)
unsigned char *end, *last;
last = dst;
- end = src + len;
+ end = src + len - 1;
/* reserve space for '\0' */
if (len < 2)
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index f6436cf..919de3e 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -135,6 +135,7 @@ int miiphy_speed (unsigned char addr)
{
unsigned short reg;
+#if defined(CONFIG_PHY_GIGE)
if (miiphy_read (addr, PHY_1000BTSR, &reg)) {
printf ("PHY 1000BT Status read failed\n");
} else {
@@ -144,6 +145,7 @@ int miiphy_speed (unsigned char addr)
}
}
}
+#endif /* CONFIG_PHY_GIGE */
if (miiphy_read (addr, PHY_ANLPAR, &reg)) {
puts ("PHY speed1 read failed, assuming 10bT\n");
@@ -165,7 +167,7 @@ int miiphy_duplex (unsigned char addr)
{
unsigned short reg;
-
+#if defined(CONFIG_PHY_GIGE)
if (miiphy_read (addr, PHY_1000BTSR, &reg)) {
printf ("PHY 1000BT Status read failed\n");
} else {
@@ -178,6 +180,7 @@ int miiphy_duplex (unsigned char addr)
}
}
}
+#endif /* CONFIG_PHY_GIGE */
if (miiphy_read (addr, PHY_ANLPAR, &reg)) {
puts ("PHY duplex read failed, assuming half duplex\n");