leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wolfgang Denk 2008-03-08 10:55:46 +01:00
commit 377151c817
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/qe/uec_phy.c
View File

@ -290,6 +290,7 @@ static int genmii_update_link (struct uec_mii_info *mii_info)
return 0; return 0;
} }
i++;
udelay(1000); /* 1 ms */ udelay(1000); /* 1 ms */
status = phy_read(mii_info, PHY_BMSR); status = phy_read(mii_info, PHY_BMSR);
} }
@ -577,7 +578,7 @@ void marvell_phy_interface_mode (struct eth_device *dev,
u16 status; u16 status;
if (!uec->mii_info) { if (!uec->mii_info) {
printf ("%s: the PHY not intialized\n", __FUNCTION__); printf ("%s: the PHY not initialized\n", __FUNCTION__);
return; return;
} }
mii_info = uec->mii_info; mii_info = uec->mii_info;

2
include/configs/MPC832XEMDS.h
View File

@ -583,7 +583,7 @@
"ramdiskaddr=1000000\0" \ "ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \ "ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \ "fdtaddr=400000\0" \
"fdtfile=mpc832xemds.dtb\0" \ "fdtfile=mpc832x_mds.dtb\0" \
"" ""
#define CONFIG_NFSBOOTCOMMAND \ #define CONFIG_NFSBOOTCOMMAND \

2
include/configs/MPC8360EMDS.h
View File

@ -615,7 +615,7 @@
"ramdiskaddr=1000000\0" \ "ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \ "ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \ "fdtaddr=400000\0" \
"fdtfile=mpc8360emds.dtb\0" \ "fdtfile=mpc836x_mds.dtb\0" \
"" ""
#define CONFIG_NFSBOOTCOMMAND \ #define CONFIG_NFSBOOTCOMMAND \

2
include/configs/MPC837XEMDS.h
View File

@ -578,7 +578,7 @@
"ramdiskaddr=1000000\0" \ "ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \ "ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \ "fdtaddr=400000\0" \
"fdtfile=mpc837xemds.dtb\0" \ "fdtfile=mpc8379_mds.dtb\0" \
"" ""
#define CONFIG_NFSBOOTCOMMAND \ #define CONFIG_NFSBOOTCOMMAND \

2
include/configs/MPC837XERDB.h
View File

@ -545,7 +545,7 @@
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot #define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage #define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #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_LOADADDR 200000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */