From: Wolfgang Denk <wd@denx.de>
Date: Wed, 20 Apr 2011 21:01:52 +0000 (+0200)
Subject: Merge branch 'phylib' of git://git.denx.de/u-boot-mmc
X-Git-Tag: v2011.06-rc1~142
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aef293bc85dad4f8d645e46d723606a747236a60;p=kernel%2Fu-boot.git

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

aef293bc85dad4f8d645e46d723606a747236a60
diff --cc common/Makefile
index 4fb050e,5f0c534..f81cff9
--- a/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