Merge branch 'next'

diff --combined include/configs/mx7_common.h
index a627456d93fb73d96f66108f03d44df03096a07f,bfad696bcdfe4e5c23b597c7fa631efc8ef16cc0..dcc53f0f5395c7766838b54e13ee575b866fe9b7
--- 1/include/configs/mx7_common.h
--- 2/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@@ -27,7 -27,6 +27,6 @@@
  
  /* Enable iomux-lpsr support */
  #define CONFIG_IOMUX_LPSR
- #define CONFIG_IMX_FIXED_IVT_OFFSET
  
  /* Size of malloc() pool */
  #define CONFIG_SYS_MALLOC_LEN           (32 * SZ_1M)
@@@ -38,8 -37,6 +37,6 @@@
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DISPLAY_BOARDINFO
  
- #define CONFIG_FSL_CLK
- 
  #define CONFIG_LOADADDR                 0x80800000
  #define CONFIG_SYS_TEXT_BASE            0x87800000
  
@@@ -53,6 -50,7 +50,6 @@@
  #define CONFIG_BAUDRATE                 115200
  
  /* Filesystems and image support */
 -#define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ
  #define CONFIG_DOS_PARTITION
  #define CONFIG_CMD_EXT2
@@@ -79,7 -77,6 +76,6 @@@
  
  /* UART */
  #define CONFIG_MXC_UART
- #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
  
  /* MMC */
  #define CONFIG_MMC