ARM: mxs: support full SPL framework

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2c52ff025a2219b7578ceefe3c014705d207a075..0acdd162b4b349accd99c1ca93099d7e2c00819e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -444,22 +444,6 @@ config TARGET_X600
        select SUPPORT_SPL
        select PL011_SERIAL
 
-config TARGET_IMX31_PHYCORE
-       bool "Support imx31_phycore_eet"
-       select CPU_ARM1136
-       select BOARD_EARLY_INIT_F
-
-config TARGET_IMX31_PHYCORE_EET
-       bool "Support imx31_phycore_eet"
-       select BOARD_LATE_INIT
-       select CPU_ARM1136
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX31ADS
-       bool "Support mx31ads"
-       select CPU_ARM1136
-       select BOARD_EARLY_INIT_F
-
 config TARGET_MX31PDK
        bool "Support mx31pdk"
        select BOARD_LATE_INIT
@@ -725,6 +709,7 @@ config ARCH_SUNXI
        select OF_BOARD_SETUP
        select OF_CONTROL
        select OF_SEPARATE
+       select SPECIFY_CONSOLE_INDEX
        select SPL_STACK_R if SPL
        select SPL_SYS_MALLOC_SIMPLE if SPL
        select SYS_NS16550
@@ -761,6 +746,7 @@ config ARCH_ZYNQ
        select SUPPORT_SPL
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
+       select BOARD_EARLY_INIT_F if WDT
        select SPL_OF_CONTROL if SPL
        select DM
        select DM_ETH if NET
@@ -914,6 +900,7 @@ config TARGET_HIKEY
        select DM_SERIAL
        select OF_CONTROL
        select PL01X_SERIAL
+       select SPECIFY_CONSOLE_INDEX
          help
          Support for HiKey 96boards platform. It features a HI6220
          SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
@@ -1130,7 +1117,7 @@ config ARCH_UNIPHIER
          (formerly, System LSI Business Division of Panasonic Corporation)
 
 config STM32
-       bool "Support STM32"
+       bool "Support STMicroelectronics STM32 MCU with cortex M"
        select CPU_V7M
        select DM
        select DM_SERIAL
@@ -1148,6 +1135,29 @@ config ARCH_STI
          Support for STMicroelectronics STiH407/10 SoC family.
          This SoC is used on Linaro 96Board STiH410-B2260
 
+config ARCH_STM32MP
+       bool "Support STMicroelectronics STM32MP Socs with cortex A"
+       select ARCH_MISC_INIT
+       select BOARD_LATE_INIT
+       select CLK
+       select DM
+       select DM_GPIO
+       select DM_RESET
+       select DM_SERIAL
+       select OF_CONTROL
+       select OF_LIBFDT
+       select PINCTRL
+       select REGMAP
+       select SUPPORT_SPL
+       select SYSCON
+       select SYSRESET
+       select SYS_THUMB_BUILD
+       help
+         Support for STM32MP SoC family developed by STMicroelectronics,
+         MPUs based on ARM cortex A core
+         U-BOOT is running in DDR and SPL support is the unsecure First Stage
+         BootLoader (FSBL)
+
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
        select OF_CONTROL
@@ -1260,6 +1270,8 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-stm32/Kconfig"
 
+source "arch/arm/mach-stm32mp/Kconfig"
+
 source "arch/arm/mach-sunxi/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"
@@ -1307,7 +1319,6 @@ source "board/freescale/ls1046ardb/Kconfig"
 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"
-source "board/freescale/mx31ads/Kconfig"
 source "board/freescale/mx31pdk/Kconfig"
 source "board/freescale/mx35pdk/Kconfig"
 source "board/freescale/s32v234evb/Kconfig"
@@ -1317,7 +1328,6 @@ source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/poplar/Kconfig"
-source "board/imx31_phycore/Kconfig"
 source "board/isee/igep003x/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/silica/pengwyn/Kconfig"
@@ -1334,6 +1344,7 @@ source "board/toradex/colibri_pxa270/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
+source "board/xilinx/zynqmp/Kconfig"
 source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"
@@ -1341,7 +1352,7 @@ source "arch/arm/Kconfig.debug"
 endmenu
 
 config SPL_LDSCRIPT
-        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX23 || ARCH_MX28
+        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
         default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
        default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64