summaryrefslogtreecommitdiff
path: root/board/apollon/apollon.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-07-10 12:05:32 -0500
committerJon Loeliger <jdl@freescale.com>2008-07-10 12:05:32 -0500
commit859f24350e6e4313626f85161dd03f025a4dac59 (patch)
treea025f68619045556e662326c8e1cbc147f9b633e /board/apollon/apollon.c
parent3473ab737282b08ad61841fcbb14c4d264a93a8e (diff)
parente0320b1ebec13755911a53b0af12cbf3e5e49a65 (diff)
downloadu-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.zip
u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.gz
u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'board/apollon/apollon.c')
-rw-r--r--board/apollon/apollon.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 7e39817..8efa703 100644
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -153,10 +153,8 @@ void ether_init(void)
do {
__raw_writew(0x1, LAN_RESET_REGISTER);
udelay(100);
- if (cnt == 0) {
- printf("1. eth reset err\n");
+ if (cnt == 0)
goto eth_reset_err_out;
- }
--cnt;
} while (__raw_readw(LAN_RESET_REGISTER) != 0x1);
@@ -165,10 +163,8 @@ void ether_init(void)
do {
__raw_writew(0x0, LAN_RESET_REGISTER);
udelay(100);
- if (cnt == 0) {
- printf("2. eth reset err\n");
+ if (cnt == 0)
goto eth_reset_err_out;
- }
--cnt;
} while (__raw_readw(LAN_RESET_REGISTER) != 0x0000);
udelay(1000);