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

diff --combined configs/mx7dsabresd_defconfig
index 08d19f9b4b507bd79c4920aef7946b92179e6961,f43f2c12d38769b07e5ae29c4d1245b6ea5341db..137369c0de2110885585d9db053dedf14a1ba703
--- 1/configs/mx7dsabresd_defconfig
--- 2/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@@ -3,7 -3,7 +3,7 @@@ CONFIG_ARCH_MX7=
  CONFIG_TARGET_MX7DSABRESD=y
  CONFIG_IMX_RDC=y
  CONFIG_IMX_BOOTAUX=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MX7D"
+ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
  # CONFIG_CMD_BOOTD is not set
  # CONFIG_CMD_IMI is not set
  # CONFIG_CMD_IMLS is not set
@@@ -12,6 -12,4 +12,6 @@@ CONFIG_CMD_GPIO=
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_PING=y
 +CONFIG_USB=y
 +CONFIG_USB_GADGET=y
  CONFIG_OF_LIBFDT=y

diff --combined include/configs/mx6sabre_common.h
index ceea74ed73bfb989a181fcb1f83d9a0b6972cd79,112f187e5dd58a884f43faab63ba37d2011e505e..3e1b760882eb1acefe922e9884c33548e7d7f719
--- 1/include/configs/mx6sabre_common.h
--- 2/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@@ -209,7 -209,7 +209,7 @@@
  #define CONFIG_ENV_IS_IN_MMC
  
  #if defined(CONFIG_ENV_IS_IN_MMC)
- #define CONFIG_ENV_OFFSET             (8 * 64 * 1024)
+ #define CONFIG_ENV_OFFSET             (768 * 1024)
  #endif
  
  /* Framebuffer */
@@@ -238,6 -238,7 +238,6 @@@
  #define CONFIG_USBD_HS
  #define CONFIG_USB_GADGET_DUALSPEED
  
 -#define CONFIG_USB_GADGET
  #define CONFIG_CMD_USB_MASS_STORAGE
  #define CONFIG_USB_FUNCTION_MASS_STORAGE
  #define CONFIG_USB_GADGET_DOWNLOAD

diff --combined include/configs/mx7dsabresd.h
index 5d897c253f8f8845eb53b5daf1e5343ef3d7e5b5,25ed29de9090490b8222f913b2e936b5d86b1a27..da1d26f3509d12438b4212b37a9e5bfd3288290d
--- 1/include/configs/mx7dsabresd.h
--- 2/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@@ -14,6 -14,14 +14,14 @@@
  #define CONFIG_DBG_MONITOR
  #define PHYS_SDRAM_SIZE                       SZ_1G
  
+ #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+ 
+ /* Size of malloc() pool */
+ #define CONFIG_SYS_MALLOC_LEN         (32 * SZ_1M)
+ 
+ #define CONFIG_BOARD_EARLY_INIT_F
+ #define CONFIG_BOARD_LATE_INIT
+ 
  /* Uncomment to enable secure boot support */
  /* #define CONFIG_SECURE_BOOT */
  #define CONFIG_CSF_SIZE                       0x4000
@@@ -253,6 -261,7 +261,6 @@@
  #define CONFIG_USBD_HS
  #define CONFIG_USB_GADGET_DUALSPEED
  
 -#define CONFIG_USB_GADGET
  #define CONFIG_CMD_USB_MASS_STORAGE
  #define CONFIG_USB_FUNCTION_MASS_STORAGE
  #define CONFIG_USB_GADGET_DOWNLOAD