Merge with /home/git/u-boot

diff --combined common/Makefile
index 1e4ce312cd2be5ca8d5689a8cea20c307d9fd952,bc1f7145056ef618e783a6f955b15922a2af9468..ef7d09707898c87d5cc451a80d310fe7d0f566e0
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -38,8 -38,8 +38,8 @@@ COBJS = main.o ACEX1K.o altera.o bedbug
          cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
          cmd_nand.o cmd_net.o cmd_nvedit.o \
          cmd_pci.o cmd_pcmcia.o cmd_portio.o \
 -        cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o \
 -        cmd_usb.o cmd_vfd.o \
 +        cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \
 +        cmd_universe.o cmd_usb.o cmd_vfd.o \
          command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
          environment.o env_common.o \
          env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
@@@ -50,7 -50,7 +50,7 @@@
          memsize.o miiphybb.o miiphyutil.o \
          s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
          usb.o usb_kbd.o usb_storage.o \
-         virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
+         virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o cmd_mfsl.o
  
  SRCS  := $(AOBJS:.o=.S) $(COBJS:.o=.c)
  OBJS  := $(addprefix $(obj),$(AOBJS) $(COBJS))