powerpc: Remove configs/BSC9131RDB_NAND_SYSCLK100_defconfig board
[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc85xx / Kconfig
index 592b581..6928851 100644 (file)
@@ -4,6 +4,14 @@ menu "mpc85xx CPU"
 config SYS_CPU
        default "mpc85xx"
 
+config CMD_ERRATA
+       bool "Enable the 'errata' command"
+       depends on MPC85xx
+       default y
+       help
+         This enables the 'errata' command which displays a list of errata
+         work-arounds which are enabled for the current board.
+
 choice
        prompt "Target select"
        optional
@@ -16,31 +24,13 @@ config TARGET_SOCRATES
        bool "Support socrates"
        select ARCH_MPC8544
 
-config TARGET_B4420QDS
-       bool "Support B4420QDS"
-       select ARCH_B4420
-       select SUPPORT_SPL
-       select PHYS_64BIT
-
-config TARGET_B4860QDS
-       bool "Support B4860QDS"
-       select ARCH_B4860
-       select BOARD_LATE_INIT if CHAIN_OF_TRUST
-       select SUPPORT_SPL
-       select PHYS_64BIT
-
-config TARGET_BSC9131RDB
-       bool "Support BSC9131RDB"
-       select ARCH_BSC9131
-       select SUPPORT_SPL
-       select BOARD_EARLY_INIT_F
-
 config TARGET_BSC9132QDS
        bool "Support BSC9132QDS"
        select ARCH_BSC9132
        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"
@@ -49,40 +39,47 @@ config TARGET_C29XPCIE
        select SUPPORT_SPL
        select SUPPORT_TPL
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_P3041DS
        bool "Support P3041DS"
        select PHYS_64BIT
        select ARCH_P3041
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P4080DS
        bool "Support P4080DS"
        select PHYS_64BIT
        select ARCH_P4080
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P5020DS
        bool "Support P5020DS"
        select PHYS_64BIT
        select ARCH_P5020
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P5040DS
        bool "Support P5040DS"
        select PHYS_64BIT
        select ARCH_P5040
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_MPC8536DS
        bool "Support MPC8536DS"
        select ARCH_MPC8536
 # Use DDR3 controller with DDR2 DIMMs on this board
        select SYS_FSL_DDRC_GEN3
-
-config TARGET_MPC8540ADS
-       bool "Support MPC8540ADS"
-       select ARCH_MPC8540
+       imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_MPC8541CDS
        bool "Support MPC8541CDS"
@@ -91,6 +88,7 @@ config TARGET_MPC8541CDS
 config TARGET_MPC8544DS
        bool "Support MPC8544DS"
        select ARCH_MPC8544
+       imply PANIC_HANG
 
 config TARGET_MPC8548CDS
        bool "Support MPC8548CDS"
@@ -100,10 +98,6 @@ config TARGET_MPC8555CDS
        bool "Support MPC8555CDS"
        select ARCH_MPC8555
 
-config TARGET_MPC8560ADS
-       bool "Support MPC8560ADS"
-       select ARCH_MPC8560
-
 config TARGET_MPC8568MDS
        bool "Support MPC8568MDS"
        select ARCH_MPC8568
@@ -117,6 +111,8 @@ config TARGET_MPC8572DS
        select ARCH_MPC8572
 # Use DDR3 controller with DDR2 DIMMs on this board
        select SYS_FSL_DDRC_GEN3
+       imply SCSI
+       imply PANIC_HANG
 
 config TARGET_P1010RDB_PA
        bool "Support P1010RDB_PA"
@@ -124,6 +120,9 @@ config TARGET_P1010RDB_PA
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select SUPPORT_TPL
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1010RDB_PB
        bool "Support P1010RDB_PB"
@@ -131,64 +130,96 @@ config TARGET_P1010RDB_PB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select SUPPORT_TPL
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1022DS
        bool "Support P1022DS"
        select ARCH_P1022
        select SUPPORT_SPL
        select SUPPORT_TPL
+       imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_P1023RDB
        bool "Support P1023RDB"
        select ARCH_P1023
+       select FSL_DDR_INTERACTIVE
+       imply CMD_EEPROM
+       imply PANIC_HANG
 
 config TARGET_P1020MBG
        bool "Support P1020MBG-PC"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020RDB_PC
        bool "Support P1020RDB-PC"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020RDB_PD
        bool "Support P1020RDB-PD"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020UTM
        bool "Support P1020UTM"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1020
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1021RDB
        bool "Support P1021RDB"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1021
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1024RDB
        bool "Support P1024RDB"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1024
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1025RDB
        bool "Support P1025RDB"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P1025
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P2020RDB
        bool "Support P2020RDB-PC"
        select SUPPORT_SPL
        select SUPPORT_TPL
        select ARCH_P2020
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P1_TWR
        bool "Support p1_twr"
@@ -199,6 +230,8 @@ config TARGET_P2041RDB
        select ARCH_P2041
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select PHYS_64BIT
+       imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_QEMU_PPCE500
        bool "Support qemu-ppce500"
@@ -211,6 +244,9 @@ config TARGET_T1024QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_EEPROM
+       imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_T1023RDB
        bool "Support T1023RDB"
@@ -218,6 +254,9 @@ 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
 
 config TARGET_T1024RDB
        bool "Support T1024RDB"
@@ -225,12 +264,19 @@ 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
 
 config TARGET_T1040QDS
        bool "Support 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
 
 config TARGET_T1040RDB
        bool "Support T1040RDB"
@@ -238,6 +284,8 @@ config TARGET_T1040RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1040D4RDB
        bool "Support T1040D4RDB"
@@ -245,6 +293,8 @@ config TARGET_T1040D4RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1042RDB
        bool "Support T1042RDB"
@@ -252,6 +302,7 @@ config TARGET_T1042RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
 
 config TARGET_T1042D4RDB
        bool "Support T1042D4RDB"
@@ -259,6 +310,8 @@ config TARGET_T1042D4RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1042RDB_PI
        bool "Support T1042RDB_PI"
@@ -266,6 +319,8 @@ config TARGET_T1042RDB_PI
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T2080QDS
        bool "Support T2080QDS"
@@ -273,6 +328,9 @@ config TARGET_T2080QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
+       select FSL_DDR_INTERACTIVE
+       imply CMD_SATA
 
 config TARGET_T2080RDB
        bool "Support T2080RDB"
@@ -280,12 +338,16 @@ config TARGET_T2080RDB
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T2081QDS
        bool "Support 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"
@@ -293,12 +355,15 @@ config TARGET_T4160QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T4160RDB
        bool "Support T4160RDB"
        select ARCH_T4160
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_T4240QDS
        bool "Support T4240QDS"
@@ -306,12 +371,18 @@ 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
 
 config TARGET_T4240RDB
        bool "Support T4240RDB"
        select ARCH_T4240
        select SUPPORT_SPL
        select PHYS_64BIT
+       select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_CONTROLCENTERD
        bool "Support controlcenterd"
@@ -319,8 +390,7 @@ config TARGET_CONTROLCENTERD
 
 config TARGET_KMP204X
        bool "Support kmp204x"
-       select ARCH_P2041
-       select PHYS_64BIT
+       select VENDOR_KM
 
 config TARGET_XPEDITE520X
        bool "Support xpedite520x"
@@ -339,16 +409,20 @@ config TARGET_XPEDITE550X
 config TARGET_UCP1020
        bool "Support uCP1020"
        select ARCH_P1020
+       imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_CYRUS_P5020
        bool "Support Varisys Cyrus P5020"
        select ARCH_P5020
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_CYRUS_P5040
         bool "Support Varisys Cyrus P5040"
        select ARCH_P5040
        select PHYS_64BIT
+       imply PANIC_HANG
 
 endchoice
 
@@ -375,6 +449,9 @@ config ARCH_B4420
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_B4860
        bool
@@ -400,6 +477,9 @@ config ARCH_B4860
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_BSC9131
        bool
@@ -413,6 +493,9 @@ config ARCH_BSC9131
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_BSC9132
        bool
@@ -424,12 +507,18 @@ config ARCH_BSC9132
        select SYS_FSL_ERRATUM_ESDHC111
        select SYS_FSL_ERRATUM_I2C_A004447
        select SYS_FSL_ERRATUM_IFC_A002769
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_MTDPARTS
+       imply CMD_NAND
+       imply CMD_PCI
+       imply CMD_REGINFO
 
 config ARCH_C29X
        bool
@@ -437,18 +526,23 @@ config ARCH_C29X
        select SYS_FSL_DDR_VER_46
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_6
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_IFC
+       imply CMD_NAND
+       imply CMD_PCI
+       imply CMD_REGINFO
 
 config ARCH_MPC8536
        bool
        select FSL_LAW
        select SYS_FSL_ERRATUM_A004508
        select SYS_FSL_ERRATUM_A005125
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR2
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
@@ -456,6 +550,9 @@ config ARCH_MPC8536
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_MPC8540
        bool
@@ -474,6 +571,7 @@ config ARCH_MPC8544
        bool
        select FSL_LAW
        select SYS_FSL_ERRATUM_A005125
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR2
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
@@ -489,12 +587,14 @@ config ARCH_MPC8548
        select SYS_FSL_ERRATUM_NMG_LBC103
        select SYS_FSL_ERRATUM_NMG_ETSEC129
        select SYS_FSL_ERRATUM_I2C_A004447
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR2
        select SYS_FSL_HAS_DDR1
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
+       imply CMD_REGINFO
 
 config ARCH_MPC8555
        bool
@@ -512,6 +612,7 @@ config ARCH_MPC8560
 config ARCH_MPC8568
        bool
        select FSL_LAW
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR2
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
@@ -522,11 +623,13 @@ config ARCH_MPC8569
        select FSL_LAW
        select SYS_FSL_ERRATUM_A004508
        select SYS_FSL_ERRATUM_A005125
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select FSL_ELBC
+       imply CMD_NAND
 
 config ARCH_MPC8572
        bool
@@ -535,6 +638,7 @@ config ARCH_MPC8572
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_DDR_115
        select SYS_FSL_ERRATUM_DDR111_DDR134
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR2
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
@@ -542,6 +646,7 @@ config ARCH_MPC8572
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_NAND
 
 config ARCH_P1010
        bool
@@ -549,6 +654,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
@@ -557,12 +663,20 @@ config ARCH_P1010
        select SYS_FSL_ERRATUM_P1010_A003549
        select SYS_FSL_ERRATUM_SEC_A003571
        select SYS_FSL_ERRATUM_IFC_A003399
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_MTDPARTS
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_PCI
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P1011
        bool
@@ -571,6 +685,7 @@ config ARCH_P1011
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_DISABLE_ASPM
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
@@ -585,12 +700,19 @@ config ARCH_P1020
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_DISABLE_ASPM
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_PCI
+       imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1021
        bool
@@ -599,12 +721,19 @@ config ARCH_P1021
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_DISABLE_ASPM
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_REGINFO
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1022
        bool
@@ -615,6 +744,7 @@ config ARCH_P1022
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
        select SYS_FSL_ERRATUM_SATA_A001
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
@@ -628,6 +758,7 @@ config ARCH_P1023
        select SYS_FSL_ERRATUM_A004508
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_I2C_A004447
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
@@ -641,12 +772,20 @@ config ARCH_P1024
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_DISABLE_ASPM
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_PCI
+       imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1025
        bool
@@ -655,12 +794,16 @@ config ARCH_P1025
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ELBC_A001
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_DISABLE_ASPM
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_P2020
        bool
@@ -670,12 +813,16 @@ config ARCH_P2020
        select SYS_FSL_ERRATUM_A005125
        select SYS_FSL_ERRATUM_ESDHC111
        select SYS_FSL_ERRATUM_ESDHC_A001
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_P2041
        bool
@@ -683,6 +830,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
@@ -698,6 +846,7 @@ config ARCH_P2041
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select FSL_ELBC
+       imply CMD_NAND
 
 config ARCH_P3041
        bool
@@ -706,6 +855,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
@@ -722,6 +872,10 @@ config ARCH_P3041
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select FSL_ELBC
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P4080
        bool
@@ -757,6 +911,9 @@ config ARCH_P4080
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_4
        select FSL_ELBC
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P5020
        bool
@@ -764,6 +921,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
@@ -778,6 +936,9 @@ config ARCH_P5020
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_ELBC
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P5040
        bool
@@ -786,6 +947,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
@@ -799,6 +961,9 @@ config ARCH_P5040
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_ELBC
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_QEMU_E500
        bool
@@ -809,6 +974,7 @@ config ARCH_T1023
        select FSL_LAW
        select SYS_FSL_DDR_VER_50
        select SYS_FSL_ERRATUM_A008378
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009663
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
@@ -819,6 +985,9 @@ config ARCH_T1023
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_T1024
        bool
@@ -826,6 +995,7 @@ config ARCH_T1024
        select FSL_LAW
        select SYS_FSL_DDR_VER_50
        select SYS_FSL_ERRATUM_A008378
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009663
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
@@ -836,6 +1006,10 @@ config ARCH_T1024
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
+       imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_MTDPARTS
+       imply CMD_REGINFO
 
 config ARCH_T1040
        bool
@@ -844,6 +1018,7 @@ config ARCH_T1040
        select SYS_FSL_DDR_VER_50
        select SYS_FSL_ERRATUM_A008044
        select SYS_FSL_ERRATUM_A008378
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009663
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
@@ -854,6 +1029,11 @@ config ARCH_T1040
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
+       imply CMD_MTDPARTS
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T1042
        bool
@@ -862,6 +1042,7 @@ config ARCH_T1042
        select SYS_FSL_DDR_VER_50
        select SYS_FSL_ERRATUM_A008044
        select SYS_FSL_ERRATUM_A008378
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009663
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
@@ -872,6 +1053,11 @@ config ARCH_T1042
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
+       imply CMD_MTDPARTS
+       imply CMD_NAND
+       imply CMD_SATA
+       imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T2080
        bool
@@ -885,8 +1071,10 @@ config ARCH_T2080
        select SYS_FSL_ERRATUM_A007212
        select SYS_FSL_ERRATUM_A007815
        select SYS_FSL_ERRATUM_A007907
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_QORIQ_CHASSIS2
@@ -894,6 +1082,10 @@ 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
@@ -907,6 +1099,7 @@ config ARCH_T2081
        select SYS_FSL_ERRATUM_A007212
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_ESDHC111
+       select FSL_PCIE_RESET
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
        select SYS_FSL_QORIQ_CHASSIS2
@@ -914,6 +1107,8 @@ config ARCH_T2081
        select SYS_FSL_SEC_COMPAT_4
        select SYS_PPC64
        select FSL_IFC
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_T4160
        bool
@@ -935,6 +1130,10 @@ config ARCH_T4160
        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_T4240
        bool
@@ -951,6 +1150,7 @@ config ARCH_T4240
        select SYS_FSL_ERRATUM_A007798
        select SYS_FSL_ERRATUM_A007815
        select SYS_FSL_ERRATUM_A007907
+       select SYS_FSL_ERRATUM_A008109
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_SEC
@@ -959,6 +1159,14 @@ config ARCH_T4240
        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 MPC85XX_HAVE_RESET_VECTOR
+       bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc"
+       depends on MPC85xx
 
 config BOOKE
        bool
@@ -972,6 +1180,7 @@ config E500
 
 config E500MC
        bool
+       imply CMD_PCI
        help
                Enble PowerPC E500MC core
 
@@ -985,8 +1194,8 @@ config FSL_LAW
        help
                Use Freescale common code for Local Access Window
 
-config SECURE_BOOT
-       bool    "Secure Boot"
+config NXP_ESBC
+       bool    "NXP_ESBC"
        help
                Enable Freescale Secure Boot feature. Normally selected
                by defconfig. If unsure, do not change.
@@ -1115,6 +1324,9 @@ config SYS_FSL_ERRATUM_A005812
 config SYS_FSL_ERRATUM_A005871
        bool
 
+config SYS_FSL_ERRATUM_A005275
+       bool
+
 config SYS_FSL_ERRATUM_A006261
        bool
 
@@ -1222,6 +1434,12 @@ config SYS_P4080_ERRATUM_SERDES_A001
 config SYS_P4080_ERRATUM_SERDES_A005
        bool
 
+config FSL_PCIE_DISABLE_ASPM
+       bool
+
+config FSL_PCIE_RESET
+       bool
+
 config SYS_FSL_QORIQ_CHASSIS1
        bool
 
@@ -1355,18 +1573,14 @@ config SYS_FSL_LBC_CLK_DIV
                Defines divider of platform clock(clock input to
                eLBC controller).
 
-source "board/freescale/b4860qds/Kconfig"
-source "board/freescale/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"
 source "board/freescale/c29xpcie/Kconfig"
 source "board/freescale/corenet_ds/Kconfig"
 source "board/freescale/mpc8536ds/Kconfig"
-source "board/freescale/mpc8540ads/Kconfig"
 source "board/freescale/mpc8541cds/Kconfig"
 source "board/freescale/mpc8544ds/Kconfig"
 source "board/freescale/mpc8548cds/Kconfig"
 source "board/freescale/mpc8555cds/Kconfig"
-source "board/freescale/mpc8560ads/Kconfig"
 source "board/freescale/mpc8568mds/Kconfig"
 source "board/freescale/mpc8569mds/Kconfig"
 source "board/freescale/mpc8572ds/Kconfig"
@@ -1386,7 +1600,7 @@ source "board/freescale/t208xrdb/Kconfig"
 source "board/freescale/t4qds/Kconfig"
 source "board/freescale/t4rdb/Kconfig"
 source "board/gdsys/p1022/Kconfig"
-source "board/keymile/kmp204x/Kconfig"
+source "board/keymile/Kconfig"
 source "board/sbc8548/Kconfig"
 source "board/socrates/Kconfig"
 source "board/varisys/cyrus/Kconfig"