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

[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc85xx / Kconfig

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 7d139ff..aebf168 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -37,6 +37,7 @@ config TARGET_B4860QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_INTERACTIVE if !SPL_BUILD
        imply PANIC_HANG
 
 config TARGET_BSC9131RDB
@@ -51,6 +52,7 @@ config TARGET_BSC9132QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select FSL_DDR_INTERACTIVE
 
 config TARGET_C29XPCIE
        bool "Support C29XPCIE"
@@ -165,6 +167,7 @@ config TARGET_P1022DS
 config TARGET_P1023RDB
        bool "Support P1023RDB"
        select ARCH_P1023
+       select FSL_DDR_INTERACTIVE
        imply CMD_EEPROM
        imply PANIC_HANG
 
@@ -273,6 +276,7 @@ config TARGET_T1023RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_INTERACTIVE
        imply CMD_EEPROM
        imply PANIC_HANG
 
@@ -282,6 +286,7 @@ config TARGET_T1024RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_INTERACTIVE
        imply CMD_EEPROM
        imply PANIC_HANG
 
@@ -290,6 +295,7 @@ config TARGET_T1040QDS
        select ARCH_T1040
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select PHYS_64BIT
+       select FSL_DDR_INTERACTIVE
        imply CMD_EEPROM
        imply CMD_SATA
        imply PANIC_HANG
@@ -344,7 +350,8 @@ config TARGET_T2080QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
-       imply CMD_SATA
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
+       select FSL_DDR_INTERACTIVE
 
 config TARGET_T2080RDB
        bool "Support T2080RDB"
@@ -353,6 +360,7 @@ config TARGET_T2080RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply FSL_SATA
        imply PANIC_HANG
 
 config TARGET_T2081QDS
@@ -360,6 +368,8 @@ config TARGET_T2081QDS
        select ARCH_T2081
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
+       select FSL_DDR_INTERACTIVE
 
 config TARGET_T4160QDS
        bool "Support T4160QDS"
@@ -383,6 +393,7 @@ config TARGET_T4240QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
        imply CMD_SATA
        imply PANIC_HANG
 
@@ -391,6 +402,7 @@ config TARGET_T4240RDB
        select ARCH_T4240
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
        imply CMD_SATA
        imply PANIC_HANG
 
@@ -402,6 +414,7 @@ config TARGET_KMP204X
        bool "Support kmp204x"
        select ARCH_P2041
        select PHYS_64BIT
+       select FSL_DDR_INTERACTIVE
        imply CMD_CRAMFS
        imply FS_CRAMFS
 
@@ -659,6 +672,7 @@ config ARCH_P1010
        select SYS_FSL_ERRATUM_A004477
        select SYS_FSL_ERRATUM_A004508
        select SYS_FSL_ERRATUM_A005125
+       select SYS_FSL_ERRATUM_A005275
        select SYS_FSL_ERRATUM_A006261
        select SYS_FSL_ERRATUM_A007075
        select SYS_FSL_ERRATUM_ESDHC111
@@ -821,6 +835,7 @@ config ARCH_P2041
        select FSL_LAW
        select SYS_FSL_ERRATUM_A004510
        select SYS_FSL_ERRATUM_A004849
+       select SYS_FSL_ERRATUM_A005275
        select SYS_FSL_ERRATUM_A006261
        select SYS_FSL_ERRATUM_CPU_A003999
        select SYS_FSL_ERRATUM_DDR_A003
@@ -845,6 +860,7 @@ config ARCH_P3041
        select SYS_FSL_DDR_VER_44
        select SYS_FSL_ERRATUM_A004510
        select SYS_FSL_ERRATUM_A004849
+       select SYS_FSL_ERRATUM_A005275
        select SYS_FSL_ERRATUM_A005812
        select SYS_FSL_ERRATUM_A006261
        select SYS_FSL_ERRATUM_CPU_A003999
@@ -910,6 +926,7 @@ config ARCH_P5020
        select FSL_LAW
        select SYS_FSL_DDR_VER_44
        select SYS_FSL_ERRATUM_A004510
+       select SYS_FSL_ERRATUM_A005275
        select SYS_FSL_ERRATUM_A006261
        select SYS_FSL_ERRATUM_DDR_A003
        select SYS_FSL_ERRATUM_DDR_A003474
@@ -935,6 +952,7 @@ config ARCH_P5040
        select SYS_FSL_DDR_VER_44
        select SYS_FSL_ERRATUM_A004510
        select SYS_FSL_ERRATUM_A004699
+       select SYS_FSL_ERRATUM_A005275
        select SYS_FSL_ERRATUM_A005812
        select SYS_FSL_ERRATUM_A006261
        select SYS_FSL_ERRATUM_DDR_A003
@@ -1063,10 +1081,8 @@ config ARCH_T2080
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_IFC
-       imply CMD_SATA
        imply CMD_NAND
        imply CMD_REGINFO
-       imply FSL_SATA
 
 config ARCH_T2081
        bool
@@ -1303,6 +1319,9 @@ config SYS_FSL_ERRATUM_A005812
 config SYS_FSL_ERRATUM_A005871
        bool
 
+config SYS_FSL_ERRATUM_A005275
+       bool
+
 config SYS_FSL_ERRATUM_A006261
        bool