Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index cf9921b37f302a937aa9df2ece32128d29474722..a42701c59b2d33fff6a6b97e7f06bae2156d0675 100644 (file)
--- 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 702b073381eea5df4eb7c53a9a5e0facede2a1f7..f32c4f70cf77782d15fe47dcc9b7aaca69559a6c 100644 (file)
--- 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 eff9fbaaee9bdf0668ddf069446ac62f92f13fd8..c8dcbc628bda039b9e80af356d49bf4d5c75187d 100644 (file)
--- 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 2222ef2199532484ac63790bf8aa3c3a8c5d32c5..5586533de59eea27ff190a5a193e4c3bc7b3df10 100644 (file)
--- 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 2da4f290f91c861e21dc7d909f84ef8f58b655ea..1964946ec8d2e8411b0aefe4b4bcf93084fa33ec 100644 (file)
--- 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 */