aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-12 23:15:53 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-12 23:15:53 +0200
commitf89920c3e4be1528ceb5b645d8aaf19968275609 (patch)
tree10382c924087f6cf212868c5c23269b477087bc3
parente5445288318de74e1fb63920e7ed7bf48088c3c2 (diff)
downloadu-boot-linaro-stable-f89920c3e4be1528ceb5b645d8aaf19968275609.tar.gz
Preserve PHY_BMCR during a soft reset.
Patch by Carl Riechers, 24 Jun 2005
-rw-r--r--CHANGELOG3
-rw-r--r--common/miiphyutil.c8
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 249905f2f..a6c64f644 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Preserve PHY_BMCR during a soft reset.
+ Patch by Carl Riechers, 24 Jun 2005
+
* VoiceBlue update: eeprom tool can also store firmware version now.
eeprom.bin is runable by jumping at load address.
Patch by Ladislav Michl, 23 May 2005
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 2b0dcf4f2..13b9c65dc 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -93,7 +93,13 @@ int miiphy_reset (unsigned char addr)
unsigned short reg;
int loop_cnt;
- if (miiphy_write (addr, PHY_BMCR, 0x8000) != 0) {
+ if (miiphy_read (addr, PHY_BMCR, &reg) != 0) {
+#ifdef DEBUG
+ printf ("PHY status read failed\n");
+#endif
+ return (-1);
+ }
+ if (miiphy_write (addr, PHY_BMCR, reg | 0x8000) != 0) {
#ifdef DEBUG
puts ("PHY reset failed\n");
#endif