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

diff --combined arch/arm/Kconfig
index 9908b430d62df47462cb31f318129fc054fc176b,0d2a808fe2aa632bfbbff5ba8a2e9a53e2e59539..506463c12cc482eb1fb70a04957e1e603cf8f9c8
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -227,6 -227,9 +227,9 @@@ config TARGET_STV099
        select CPU_V7
        select DM
        select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH
+       select SPI_FLASH
  
  config TARGET_X600
        bool "Support x600"
@@@ -589,6 -592,10 +592,6 @@@ config TARGET_TBS291
        bool "Support tbs2910"
        select CPU_V7
  
 -config TARGET_TQMA6
 -      bool "TQ Systems TQMa6 board"
 -      select CPU_V7
 -
  config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7
@@@ -972,6 -979,7 +975,6 @@@ source "board/ti/ti816x/Kconfig
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/toradex/colibri_vf/Kconfig"
 -source "board/tqc/tqma6/Kconfig"
  source "board/trizepsiv/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"
  source "board/udoo/Kconfig"