From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 26 Oct 2012 05:00:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'u-boot-ti/master'
X-Git-Tag: v2013.01-rc1~73^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c68436fa427a69ea308d74c410067507d6c7103b;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge remote-tracking branch 'u-boot-ti/master'
---

c68436fa427a69ea308d74c410067507d6c7103b
diff --combined include/configs/mx28evk.h
index 1443833,e188f02..2916c71
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@@ -142,7 -142,7 +142,7 @@@
  #ifdef	CONFIG_CMD_MMC
  #define CONFIG_MMC
  #define CONFIG_GENERIC_MMC
 -#define CONFIG_MMC_BOUNCE_BUFFER
 +#define CONFIG_BOUNCE_BUFFER
  #define CONFIG_MXS_MMC
  #endif
  
@@@ -313,7 -313,7 +313,7 @@@
  		"dhcp ${uimage}; bootm\0"
  
  #define CONFIG_BOOTCOMMAND \
- 	"if mmc rescan ${mmcdev}; then " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
  		"if run loadbootscript; then " \
  			"run bootscript; " \
  		"else " \
diff --combined spl/Makefile
index 20a943c,7b52bd1..3195390
--- a/spl/Makefile
+++ b/spl/Makefile
@@@ -112,16 -112,13 +112,13 @@@ LDPPFLAGS += 
  	$(shell $(LD) --version | \
  	  sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
  
- ifdef CONFIG_OMAP
  $(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
  
  ALL-y	+= $(obj)u-boot-spl.bin
  
@@@ -154,12 -151,8 +151,12 @@@ $(START):	depen
  $(LIBS):	depend
  	$(MAKE) -C $(SRCTREE)$(dir $(subst $(SPLTREE),,$@))
  
 -$(obj)u-boot-spl.lds: $(LDSCRIPT) depend
 -	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - < $< > $@
 +# The following line expands into whole rule which generates u-boot.lst,
 +# the file containing u-boots LG-array linker section. This is included into
 +# $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 +$(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS)))
 +$(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend
 +	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
  
  depend:	$(obj).depend
  .PHONY: depend