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

diff --combined arch/arm/Kconfig
index 9292e9878df39111aaddfc309e5b0485de4ebc1e,c0a0fd842a0ba912d70c34d95f2fd5842df02a59..80b0d34190fc3bafb834ca8dc039ef8466b20255
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -286,8 -286,13 +286,8 @@@ config TARGET_MX35PD
        bool "Support mx35pdk"
        select CPU_ARM1136
  
 -config TARGET_RPI
 -      bool "Support rpi"
 -      select CPU_ARM1176
 -
 -config TARGET_RPI_2
 -      bool "Support rpi_2"
 -      select CPU_V7
 +config ARCH_BCM283X
 +      bool "Broadcom BCM283X family"
  
  config TARGET_INTEGRATORAP_CM946ES
        bool "Support integratorap_cm946es"
@@@ -428,6 -433,10 +428,10 @@@ config ARCH_KEYSTON
        select CPU_V7
        select SUPPORT_SPL
  
+ config ARCH_MX6
+       bool "Freescale MX6"
+       select CPU_V7
+ 
  config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
@@@ -718,9 -727,9 +722,9 @@@ endchoic
  
  source "arch/arm/mach-at91/Kconfig"
  
 -source "arch/arm/mach-davinci/Kconfig"
 +source "arch/arm/mach-bcm283x/Kconfig"
  
 -source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
 +source "arch/arm/mach-davinci/Kconfig"
  
  source "arch/arm/cpu/armv7/exynos/Kconfig"
  
@@@ -730,6 -739,8 +734,8 @@@ source "arch/arm/mach-keystone/Kconfig
  
  source "arch/arm/mach-kirkwood/Kconfig"
  
+ source "arch/arm/cpu/armv7/mx6/Kconfig"
+ 
  source "arch/arm/mach-nomadik/Kconfig"
  
  source "arch/arm/cpu/armv7/omap3/Kconfig"
@@@ -756,6 -767,8 +762,8 @@@ source "arch/arm/cpu/armv7/Kconfig
  
  source "arch/arm/cpu/armv8/Kconfig"
  
+ source "arch/arm/imx-common/Kconfig"
+ 
  source "board/aristainetos/Kconfig"
  source "board/BuR/kwb/Kconfig"
  source "board/BuR/tseries/Kconfig"
@@@ -829,6 -842,8 +837,6 @@@ source "board/palmtreo680/Kconfig
  source "board/phytec/pcm051/Kconfig"
  source "board/ppcag/bg0900/Kconfig"
  source "board/pxa255_idp/Kconfig"
 -source "board/raspberrypi/rpi/Kconfig"
 -source "board/raspberrypi/rpi_2/Kconfig"
  source "board/samsung/smdk2410/Kconfig"
  source "board/sandisk/sansa_fuze_plus/Kconfig"
  source "board/scb9328/Kconfig"