ARM: mxs: support full SPL framework

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 777b2f01ec58d8714468a1d39745ddb31f0f9405..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
@@ -1166,6 +1150,7 @@ config ARCH_STM32MP
        select REGMAP
        select SUPPORT_SPL
        select SYSCON
+       select SYSRESET
        select SYS_THUMB_BUILD
        help
          Support for STM32MP SoC family developed by STMicroelectronics,
@@ -1334,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"
@@ -1344,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"
@@ -1369,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