From: Stefano Babic <sbabic@denx.de>
Date: Fri, 10 Jul 2015 07:21:44 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: v2015.10-rc1~2^2~64
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1254ff97abb7606ccd0d7bdcd9f22581c50fe535;hp=-c;p=u-boot

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

1254ff97abb7606ccd0d7bdcd9f22581c50fe535
diff --combined include/configs/mx53loco.h
index b3ac5e2c76,53f725d14e..ad2629da72
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@@ -43,7 -43,6 +43,7 @@@
  #define CONFIG_MMC
  #define CONFIG_CMD_MMC
  #define CONFIG_GENERIC_MMC
 +#define CONFIG_CMD_FS_GENERIC
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_EXT2
  #define CONFIG_DOS_PARTITION
@@@ -93,12 -92,9 +93,9 @@@
  #define CONFIG_BAUDRATE			115200
  
  /* Command definition */
- #include <config_cmd_default.h>
  #define CONFIG_CMD_BOOTZ
  #define CONFIG_SUPPORT_RAW_INITRD
  
- #undef CONFIG_CMD_IMLS
- 
  #define CONFIG_BOOTDELAY	1
  
  #define CONFIG_ETHPRIME		"FEC0"
@@@ -117,11 -113,11 +114,11 @@@
  	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
  	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \
  	"loadbootscript=" \
 -		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  	"bootscript=echo Running bootscript from mmc ...; " \
  		"source\0" \
 -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 +	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 +	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
  	"mmcboot=echo Booting from mmc ...; " \
  		"run mmcargs; " \
  		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \