diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-08 10:55:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-08 10:55:46 +0100 |
| commit | 377151c8173ee64cfc3fdfb545b366c36d8ce3b2 (patch) | |
| tree | 0ccfa0296c97df5a04ab192da8bfe2a0cc4f5be5 | |
| parent | 1ac14d8ea8c8421cd3328da254a79f46d0d2dd96 (diff) | |
| parent | 270fe261b7f9292800b2b3d1bf19ae7cbc880258 (diff) | |
| download | u-boot-imx-377151c8173ee64cfc3fdfb545b366c36d8ce3b2.zip u-boot-imx-377151c8173ee64cfc3fdfb545b366c36d8ce3b2.tar.gz u-boot-imx-377151c8173ee64cfc3fdfb545b366c36d8ce3b2.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
| -rw-r--r-- | drivers/qe/uec_phy.c | 3 | ||||
| -rw-r--r-- | include/configs/MPC832XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8360EMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XERDB.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index cf9921b..a42701c 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; diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 702b073..f32c4f7 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 eff9fba..c8dcbc6 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 2222ef2..5586533 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 2da4f29..1964946 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 */ |