Merge git://git.denx.de/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5080a96..80038ec 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -466,12 +466,14 @@ config ARCH_MX7
        select CPU_V7
        select SYS_FSL_HAS_SEC if SECURE_BOOT
        select SYS_FSL_SEC_COMPAT_4
+       select SYS_FSL_SEC_LE
 
 config ARCH_MX6
        bool "Freescale MX6"
        select CPU_V7
        select SYS_FSL_HAS_SEC if SECURE_BOOT
        select SYS_FSL_SEC_COMPAT_4
+       select SYS_FSL_SEC_LE
 
 config ARCH_MX5
        bool "Freescale MX5"
@@ -544,6 +546,7 @@ config ARCH_RMOBILE
 config TARGET_S32V234EVB
        bool "Support s32v234evb"
        select ARM64
+       select SYS_FSL_ERRATUM_ESDHC111
 
 config ARCH_SNAPDRAGON
        bool "Qualcomm Snapdragon SoCs"
@@ -600,22 +603,31 @@ config TARGET_TS4600
 config TARGET_TS4800
        bool "Support TS4800"
        select CPU_V7
+       select SYS_FSL_ERRATUM_ESDHC_A001
 
 config TARGET_VF610TWR
        bool "Support vf610twr"
        select CPU_V7
+       select SYS_FSL_ERRATUM_ESDHC111
 
 config TARGET_COLIBRI_VF
        bool "Support Colibri VF50/61"
        select CPU_V7
+       select SYS_FSL_ERRATUM_ESDHC111
 
 config TARGET_PCM052
        bool "Support pcm-052"
        select CPU_V7
+       select SYS_FSL_ERRATUM_ESDHC111
+       select SYS_FSL_ERRATUM_ESDHC135
+       select SYS_FSL_ERRATUM_ESDHC_A001
 
 config TARGET_BK4R1
        bool "Support BK4r1"
        select CPU_V7
+       select SYS_FSL_ERRATUM_ESDHC111
+       select SYS_FSL_ERRATUM_ESDHC135
+       select SYS_FSL_ERRATUM_ESDHC_A001
 
 config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
@@ -768,6 +780,7 @@ config TARGET_LS1021AQDS
        select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
        select LS1_DEEP_SLEEP
+       select SYS_FSL_DDR
 
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
@@ -831,6 +844,7 @@ config TARGET_LS1046ARDB
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
        select DM_SPI_FLASH if DM_SPI
+       select POWER_MC34VR500
        help
          Support for Freescale LS1046ARDB platform.
          The LS1046A Reference Design Board (RDB) is a high-performance