Merge git://git.denx.de/u-boot

diff --cc MAINTAINERS
index 311c0e7fb637d44466d199f286ddc8d5b82bd9bc,c43057484c2fc01c1e830bb0bff0a3060edf50bc..e34d9f3ec36811ae170b10c7397da604e4379f2b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -584,8 -580,11 +580,12 @@@ Stefano Babic <sbabic@denx.de
        trizepsiv       xscale/pxa
        twister         omap3
        vision2         i.MX51
 +      woodburn        i.MX35
  
+ Lukasz Dalek <luk0104@gmail.com>
+ 
+       h2200           xscale/pxa
+ 
  Jason Liu <r64343@freescale.com>
  
        mx53evk         i.MX53

diff --cc Makefile
index 249b109c32a76e4576d2b439cc0ce280532d2a28,9dc89f938c56954dda780ed675160501a23fa6c0..4fc6a82f79a94d0375c53a81e303d799fa9f5c35
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -841,10 -836,11 +836,12 @@@ clobber:        tid
        @rm -f $(obj)u-boot.dtb
        @rm -f $(obj)u-boot.sb
        @rm -f $(obj)u-boot.spr
-       @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
-       @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
+       @rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
+       @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
+       @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map}
+       @rm -f $(obj)spl/{u-boot-spl.lds,u-boot.lst}
        @rm -f $(obj)MLO
 +      @rm -f $(obj)SPL
        @rm -f $(obj)tools/xway-swap-bytes
        @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c

diff --cc board/freescale/mx31ads/u-boot.lds
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc include/configs/mx51evk.h
Simple merge

diff --cc include/configs/mx53evk.h
Simple merge

diff --cc include/configs/mx53loco.h
Simple merge

diff --cc nand_spl/board/freescale/mx31pdk/u-boot.lds
Simple merge

diff --cc spl/Makefile
index 58ef40ac0140c0668317d1eeaa3f11b4d0978c0d,3195390b2ff63e1bd1419d0918d2ac726a0673cd..6a79c3cd38f052079106271a109c288c0d574665
--- 1/spl/Makefile
--- 2/spl/Makefile
+++ b/spl/Makefile
@@@ -115,20 -115,11 +115,17 @@@ LDPPFLAGS += 
  $(OBJTREE)/MLO:       $(obj)u-boot-spl.bin
        $(OBJTREE)/tools/mkimage -T omapimage \
                -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
- endif
- ifdef CONFIG_AM33XX
- $(OBJTREE)/MLO:       $(obj)u-boot-spl.bin
-       $(OBJTREE)/tools/mkimage -T omapimage \
+ 
+ $(OBJTREE)/MLO.byteswap: $(obj)u-boot-spl.bin
+       $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
                -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
- endif
  
 +ifneq ($(CONFIG_IMX_CONFIG),)
 +$(OBJTREE)/SPL:       $(obj)u-boot-spl.bin
 +      $(OBJTREE)/tools/mkimage -n  $(SRCTREE)/$(CONFIG_IMX_CONFIG) -T imximage \
 +              -e $(CONFIG_SPL_TEXT_BASE) -d $< $@
 +endif
 +
  ALL-y += $(obj)u-boot-spl.bin
  
  ifdef CONFIG_SAMSUNG