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

diff --combined common/Makefile
index 35ea3745fcaf0a2253d15004c0454ef5d020da07,382dd018001b76d8203664f4f5f5893d3743093d..0d67337d2695be5071d8a8f19af83407c96263bf
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -88,7 -88,7 +88,7 @@@ COBJS-y += cmd_pcmcia.
  COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
  COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
  COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
 -COBJS-y += cmd_sata.o
 +COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o
  COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
  COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o
  COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
@@@ -140,6 -140,7 +140,7 @@@ COBJS-y += crc16.
  COBJS-y += xyzModem.o
  COBJS-y += cmd_mac.o
  COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
+ COBJS-$(CONFIG_MP) += cmd_mp.o
  
  COBJS := $(COBJS-y)
  SRCS  := $(AOBJS:.o=.S) $(COBJS:.o=.c)