Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-stm32 / Kconfig

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index 13532843fbc84f38ad7b5dc2f312156e6d6f0efc..b42b05669a12f8c221afc516eb3802b3fd72a2aa 100644 (file)
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -1,4 +1,4 @@
-if STM32
+if ARCH_STM32
 
 config STM32F4
        bool "stm32f4 family"
@@ -9,9 +9,9 @@ config STM32F4
        select PINCTRL
        select PINCTRL_STM32
        select RAM
-       select STM32_SDRAM
        select STM32_RCC
        select STM32_RESET
+       select STM32_SDRAM
        select STM32_SERIAL
        select STM32_TIMER
        select TIMER
@@ -25,17 +25,11 @@ config STM32F7
        select PINCTRL
        select PINCTRL_STM32
        select RAM
-       select STM32_SDRAM
-       select STM32_RCC
-       select STM32_RESET
-       select STM32_SERIAL
-       select STM32_TIMER
-       select TIMER
-       select SUPPORT_SPL
        select SPL
        select SPL_BOARD_INIT
        select SPL_CLK
        select SPL_DM
+       select SPL_DM_RESET
        select SPL_DM_SEQ_ALIAS
        select SPL_DRIVERS_MISC_SUPPORT
        select SPL_GPIO_SUPPORT
@@ -45,13 +39,20 @@ config STM32F7
        select SPL_OF_CONTROL
        select SPL_OF_LIBFDT
        select SPL_OF_TRANSLATE
-       imply SPL_OS_BOOT
        select SPL_PINCTRL
        select SPL_RAM
        select SPL_SERIAL_SUPPORT
        select SPL_SYS_MALLOC_SIMPLE
        select SPL_TIMER
        select SPL_XIP_SUPPORT
+       select STM32_RCC
+       select STM32_RESET
+       select STM32_SDRAM
+       select STM32_SERIAL
+       select STM32_TIMER
+       select SUPPORT_SPL
+       select TIMER
+       imply SPL_OS_BOOT
 
 config STM32H7
        bool "stm32h7 family"
@@ -63,9 +64,9 @@ config STM32H7
        select PINCTRL_STM32
        select RAM
        select REGMAP
-       select STM32_SDRAM
        select STM32_RCC
        select STM32_RESET
+       select STM32_SDRAM
        select STM32_SERIAL
        select STM32_TIMER
        select SYSCON