From f30b6154f16f5ffa4a9f5bfca5e114d72b6ef675 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Wed, 27 Feb 2008 16:08:22 -0600 Subject: net: uec_phy: actually increment the timeout counter allow u-boot to recover (and, e.g., switch to another interface) in the case where a PHY does not report autonegotiation is complete within its two second timeout value. Signed-off-by: Kim Phillips --- drivers/qe/uec_phy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index cf9921b37f..a42701c59b 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -290,6 +290,7 @@ static int genmii_update_link (struct uec_mii_info *mii_info) return 0; } + i++; udelay(1000); /* 1 ms */ status = phy_read(mii_info, PHY_BMSR); } @@ -577,7 +578,7 @@ void marvell_phy_interface_mode (struct eth_device *dev, u16 status; if (!uec->mii_info) { - printf ("%s: the PHY not intialized\n", __FUNCTION__); + printf ("%s: the PHY not initialized\n", __FUNCTION__); return; } mii_info = uec->mii_info; -- cgit v1.2.3 From 270fe261b7f9292800b2b3d1bf19ae7cbc880258 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Fri, 7 Mar 2008 12:27:31 -0600 Subject: mpc83xx: make dtb basename file references equal those of linux the dts file basenames were updated in linux - this helps avoid inadvertently loading any old dtbs laying around. Signed-off-by: Kim Phillips --- include/configs/MPC832XEMDS.h | 2 +- include/configs/MPC8360EMDS.h | 2 +- include/configs/MPC837XEMDS.h | 2 +- include/configs/MPC837XERDB.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 702b073381..f32c4f70cf 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -583,7 +583,7 @@ "ramdiskaddr=1000000\0" \ "ramdiskfile=ramfs.83xx\0" \ "fdtaddr=400000\0" \ - "fdtfile=mpc832xemds.dtb\0" \ + "fdtfile=mpc832x_mds.dtb\0" \ "" #define CONFIG_NFSBOOTCOMMAND \ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index eff9fbaaee..c8dcbc628b 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -615,7 +615,7 @@ "ramdiskaddr=1000000\0" \ "ramdiskfile=ramfs.83xx\0" \ "fdtaddr=400000\0" \ - "fdtfile=mpc8360emds.dtb\0" \ + "fdtfile=mpc836x_mds.dtb\0" \ "" #define CONFIG_NFSBOOTCOMMAND \ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 2222ef2199..5586533de5 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -578,7 +578,7 @@ "ramdiskaddr=1000000\0" \ "ramdiskfile=ramfs.83xx\0" \ "fdtaddr=400000\0" \ - "fdtfile=mpc837xemds.dtb\0" \ + "fdtfile=mpc8379_mds.dtb\0" \ "" #define CONFIG_NFSBOOTCOMMAND \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2da4f290f9..1964946ec8 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -545,7 +545,7 @@ #define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot #define CONFIG_BOOTFILE uImage #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ -#define CONFIG_FDTFILE mpc837x_rdb.dtb +#define CONFIG_FDTFILE mpc8379_rdb.dtb #define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ -- cgit v1.2.3