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

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --combined README
index 7a4f34282750f3e3f425065407067668c541b80c,6336c5c4881e3a2bcf558e843a0f011de51d9bc5..2df0e1f8a78e66f075a6c5c0991402440f064c4f
--- 1/README
--- 2/README
+++ b/README
@@@ -2362,6 -2362,13 +2362,13 @@@ The following options need to be config
                        CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
                                                    the bootcounter.
                        CONFIG_BOOTCOUNT_ALEN = address len
+               CONFIG_BOOTCOUNT_EXT
+               enable support for the bootcounter in EXT filesystem
+                       CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read
+                                                     and write.
+                       CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE = interface
+                       CONFIG_SYS_BOOTCOUNT_EXT_DEVPART = device and part
+                       CONFIG_SYS_BOOTCOUNT_EXT_NAME = filename
  
  - Show boot progress:
                CONFIG_SHOW_BOOT_PROGRESS
@@@ -5152,7 -5159,7 +5159,7 @@@ may be rejected, even when they contai
  Please see http://www.denx.de/wiki/U-Boot/Patches for details.
  
  Patches shall be sent to the u-boot mailing list <u-boot@lists.denx.de>;
 -see http://lists.denx.de/mailman/listinfo/u-boot
 +see https://lists.denx.de/listinfo/u-boot
  
  When you send a patch, please include the following information with
  it:

diff --combined configs/mx6cuboxi_defconfig
index bd7917e51e432179923304d5f2ea4a493c754458,e729def89afa123a61023ccab783f282d060174d..37a2f2abd3a1fdc87f5d5b7b11469915534fd55a
--- 1/configs/mx6cuboxi_defconfig
--- 2/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@@ -11,8 -11,7 +11,8 @@@ CONFIG_SPL_WATCHDOG_SUPPORT=
  # CONFIG_CMD_BMODE is not set
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_DISTRO_DEFAULTS=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
+ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  # CONFIG_SYS_STDIO_DEREGISTER is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y

diff --combined configs/wandboard_defconfig
index d053db743ed83b2b394eb8db70ff6ce97c667a8e,a4518fcce0defa6dbcdde65d332df3bff1153b41..4b6b9d9aaee7a5dc11144787bec158f28f9ebb12
--- 1/configs/wandboard_defconfig
--- 2/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@@ -10,8 -10,7 +10,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT=
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_DISTRO_DEFAULTS=y
 -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y