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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 33c8411e3eba7ce4a6120c8776d9032adccb2e5d..d2dbb1a5c27f2db05ed2b5727dbfdcbee80adbfa 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -558,15 +558,15 @@ config ARCH_ZYNQ
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL

-       select SPL_OF_CONTROL
+       select SPL_OF_CONTROL if SPL

        select DM
        select DM_ETH
        select DM
        select DM_ETH

-       select SPL_DM
+       select SPL_DM if SPL

        select DM_MMC
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
        select DM_MMC
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH

-       select SPL_SEPARATE_BSS
+       select SPL_SEPARATE_BSS if SPL

 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"


@@ -702,8 +702,8 @@ config ARCH_UNIPHIER
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 

-config TARGET_STM32F429_DISCOVERY
-       bool "Support STM32F429 Discovery"
+config STM32
+       bool "Support STM32"

        select CPU_V7M
        select DM
        select DM_SERIAL
        select CPU_V7M
        select DM
        select DM_SERIAL


@@ -762,6 +762,8 @@ source "arch/arm/mach-s5pc1xx/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"
 
 
 source "arch/arm/mach-socfpga/Kconfig"
 

+source "arch/arm/mach-stm32/Kconfig"
+

 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"


@@ -836,7 +838,6 @@ source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"

-source "board/st/stm32f429-discovery/Kconfig"

 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"