Commit 377151c8 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

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

parents 1ac14d8e 270fe261
......@@ -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;
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment