Merge branch 'phylib' of git://git.denx.de/u-boot-mmc

diff --cc common/Makefile
index 4fb050eb58e235787a5f4fc6c741a51a456f153a,5f0c5340a09819a217b1111ef78d08e1429f58b3..f81cff93c973309bdfcedab9a54acaed8add2f68
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -117,10 -115,13 +117,14 @@@ COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.
  COBJS-$(CONFIG_CMD_MG_DISK) += cmd_mgdisk.o
  COBJS-$(CONFIG_MII) += miiphyutil.o
  COBJS-$(CONFIG_CMD_MII) += miiphyutil.o
+ COBJS-$(CONFIG_PHYLIB) += miiphyutil.o
  COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
+ ifdef CONFIG_PHYLIB
+ COBJS-$(CONFIG_CMD_MII) += cmd_mdio.o
+ endif
  COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
  COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 +COBJS-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o
  COBJS-$(CONFIG_MP) += cmd_mp.o
  COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
  COBJS-$(CONFIG_CMD_NAND) += cmd_nand.o