From: Stefano Babic <sbabic@denx.de>
Date: Sat, 10 Nov 2012 07:05:54 +0000 (+0100)
Subject: Merge git://git.denx.de/u-boot
X-Git-Tag: v2013.01-rc3~13^2~67
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=3e4d27b06d7484040355e22eec2cbce7335d6dab

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

3e4d27b06d7484040355e22eec2cbce7335d6dab
diff --cc MAINTAINERS
index 311c0e7fb6,c43057484c..e34d9f3ec3
--- a/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 249b109c32,9dc89f938c..4fc6a82f79
--- a/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 spl/Makefile
index 58ef40ac01,3195390b2f..6a79c3cd38
--- a/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