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

diff --combined arch/arm/Kconfig
index 086ca8514f84e721e9886000a56d216b108c5171,06b8e58a3240b2c54e93b138aa406fdfc2b880fc..7ed0e2052107cf2045251185fd204b02d7eabbfa
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -132,11 -132,6 +132,11 @@@ config TARGET_DEVKIT325
        bool "Support devkit3250"
        select CPU_ARM926EJS
  
 +config TARGET_WORK_92105
 +      bool "Support work_92105"
 +      select CPU_ARM926EJS
 +      select SUPPORT_SPL
 +
  config TARGET_MX25PDK
        bool "Support mx25pdk"
        select CPU_ARM926EJS
@@@ -291,8 -286,13 +291,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"
@@@ -437,6 -437,10 +437,10 @@@ config ARCH_MX
        bool "Freescale MX6"
        select CPU_V7
  
+ config ARCH_MX5
+       bool "Freescale MX5"
+       select CPU_V7
+ 
  config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
@@@ -727,9 -731,9 +731,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"
  
@@@ -741,6 -745,8 +745,8 @@@ source "arch/arm/mach-kirkwood/Kconfig
  
  source "arch/arm/cpu/armv7/mx6/Kconfig"
  
+ source "arch/arm/cpu/armv7/mx5/Kconfig"
+ 
  source "arch/arm/mach-nomadik/Kconfig"
  
  source "arch/arm/cpu/armv7/omap3/Kconfig"
@@@ -842,6 -848,8 +848,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"
@@@ -877,7 -885,6 +883,7 @@@ source "board/vpac270/Kconfig
  source "board/wandboard/Kconfig"
  source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"
 +source "board/work-microwave/work_92105/Kconfig"
  source "board/xaeniax/Kconfig"
  source "board/xilinx/zynqmp/Kconfig"
  source "board/zipitz2/Kconfig"