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

diff --combined arch/arm/Kconfig
index 17942965af71021b35fe9b7f0023eb805e52d64a,dd987cca76a4077552569d38efdba974e0908c6a..4f26d289be703f13eacd06ebfed31629e667b28a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -287,6 -287,9 +287,6 @@@ config TARGET_SC_SPS_
  config TARGET_NHK8815
        bool "Support nhk8815"
  
 -config TARGET_OMAP5912OSK
 -      bool "Support omap5912osk"
 -
  config TARGET_EDMINIV2
        bool "Support edminiv2"
  
@@@ -509,9 -512,6 +509,9 @@@ config TARGET_CGTQMX6EVA
  config TARGET_EMBESTMX6BOARDS
        bool "Support embestmx6boards"
  
 +config TARGET_ARISTAINETOS
 +      bool "Support aristainetos"
 +
  config TARGET_MX6QARM2
        bool "Support mx6qarm2"
  
@@@ -524,9 -524,6 +524,9 @@@ config TARGET_MX6SABRES
  config TARGET_MX6SLEVK
        bool "Support mx6slevk"
  
 +config TARGET_MX6SXSABRESD
 +      bool "Support mx6sxsabresd"
 +
  config TARGET_GW_VENTANA
        bool "Support gw_ventana"
  
@@@ -704,6 -701,9 +704,9 @@@ config TARGET_WHISTLE
  config TARGET_COLIBRI_T20_IRIS
        bool "Support colibri_t20_iris"
  
+ config TARGET_COLIBRI_T30
+       bool "Support Colibri T30"
+ 
  config TARGET_TEC_NG
        bool "Support tec-ng"
  
@@@ -776,7 -776,6 +779,7 @@@ config TARGET_JORNAD
  endchoice
  
  source "board/8dtech/eco5pk/Kconfig"
 +source "board/aristainetos/Kconfig"
  source "board/Barix/ipam390/Kconfig"
  source "board/BuR/kwb/Kconfig"
  source "board/BuR/tseries/Kconfig"
@@@ -884,7 -883,6 +887,7 @@@ source "board/freescale/mx6qarm2/Kconfi
  source "board/freescale/mx6qsabreauto/Kconfig"
  source "board/freescale/mx6sabresd/Kconfig"
  source "board/freescale/mx6slevk/Kconfig"
 +source "board/freescale/mx6sxsabresd/Kconfig"
  source "board/freescale/vf610twr/Kconfig"
  source "board/gateworks/gw_ventana/Kconfig"
  source "board/genesi/mx51_efikamx/Kconfig"
@@@ -982,6 -980,7 +985,6 @@@ source "board/ti/beagle/Kconfig
  source "board/ti/dra7xx/Kconfig"
  source "board/ti/evm/Kconfig"
  source "board/ti/ks2_evm/Kconfig"
 -source "board/ti/omap5912osk/Kconfig"
  source "board/ti/omap5_uevm/Kconfig"
  source "board/ti/panda/Kconfig"
  source "board/ti/sdp3430/Kconfig"
@@@ -993,6 -992,7 +996,7 @@@ source "board/timll/devkit3250/Kconfig
  source "board/timll/devkit8000/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/toradex/colibri_t20_iris/Kconfig"
+ source "board/toradex/colibri_t30/Kconfig"
  source "board/trizepsiv/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"
  source "board/udoo/Kconfig"