ata: Migrate CONFIG_SATA_SIL to Kconfig

[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 0c74f1d..1b0e3d3 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -19,7 +19,6 @@ choice
 config TARGET_SBC8548
        bool "Support sbc8548"
        select ARCH_MPC8548
-       imply ENV_IS_IN_FLASH
 
 config TARGET_SOCRATES
        bool "Support socrates"
@@ -105,7 +104,6 @@ config TARGET_MPC8544DS
 config TARGET_MPC8548CDS
        bool "Support MPC8548CDS"
        select ARCH_MPC8548
-       imply ENV_IS_IN_FLASH
 
 config TARGET_MPC8555CDS
        bool "Support MPC8555CDS"
@@ -211,6 +209,7 @@ config TARGET_P1025RDB
        select ARCH_P1025
        imply CMD_EEPROM
        imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P2020RDB
        bool "Support P2020RDB-PC"
@@ -219,6 +218,7 @@ config TARGET_P2020RDB
        select ARCH_P2020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P1_TWR
        bool "Support p1_twr"
@@ -426,6 +426,8 @@ config ARCH_B4420
        select SYS_PPC64
        select FSL_IFC
        imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_B4860
        bool
@@ -452,6 +454,8 @@ config ARCH_B4860
        select SYS_PPC64
        select FSL_IFC
        imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_BSC9131
        bool
@@ -466,6 +470,8 @@ config ARCH_BSC9131
        select SYS_FSL_SEC_COMPAT_4
        select FSL_IFC
        imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_BSC9132
        bool
@@ -485,6 +491,9 @@ config ARCH_BSC9132
        select FSL_IFC
        imply CMD_EEPROM
        imply CMD_MTDPARTS
+       imply CMD_NAND
+       imply CMD_PCI
+       imply CMD_REGINFO
 
 config ARCH_C29X
        bool
@@ -498,6 +507,9 @@ config ARCH_C29X
        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
@@ -511,7 +523,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
@@ -551,7 +565,7 @@ config ARCH_MPC8548
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
-       imply ENV_IS_IN_FLASH
+       imply CMD_REGINFO
 
 config ARCH_MPC8555
        bool
@@ -584,6 +598,7 @@ config ARCH_MPC8569
        select SYS_FSL_SEC_BE
        select SYS_FSL_SEC_COMPAT_2
        select FSL_ELBC
+       imply CMD_NAND
 
 config ARCH_MPC8572
        bool
@@ -599,7 +614,7 @@ config ARCH_MPC8572
        select SYS_FSL_SEC_COMPAT_2
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
-       imply ENV_IS_IN_FLASH
+       imply CMD_NAND
 
 config ARCH_P1010
        bool
@@ -623,7 +638,10 @@ config ARCH_P1010
        select FSL_IFC
        imply CMD_EEPROM
        imply CMD_MTDPARTS
+       imply CMD_NAND
        imply CMD_SATA
+       imply CMD_PCI
+       imply CMD_REGINFO
 
 config ARCH_P1011
        bool
@@ -652,7 +670,11 @@ config ARCH_P1020
        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
@@ -667,7 +689,11 @@ config ARCH_P1021
        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
@@ -711,7 +737,11 @@ config ARCH_P1024
        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
@@ -727,6 +757,7 @@ config ARCH_P1025
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
        imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_P2020
        bool
@@ -743,6 +774,8 @@ config ARCH_P2020
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
        imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_P2041
        bool
@@ -765,6 +798,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
@@ -789,7 +823,9 @@ 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
 
 config ARCH_P4080
        bool
@@ -826,6 +862,8 @@ config ARCH_P4080
        select SYS_FSL_SEC_COMPAT_4
        select FSL_ELBC
        imply CMD_SATA
+       imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P5020
        bool
@@ -848,6 +886,7 @@ config ARCH_P5020
        select SYS_PPC64
        select FSL_ELBC
        imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_P5040
        bool
@@ -870,6 +909,7 @@ config ARCH_P5040
        select SYS_PPC64
        select FSL_ELBC
        imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_QEMU_E500
        bool
@@ -891,6 +931,8 @@ config ARCH_T1023
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
        imply CMD_EEPROM
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_T1024
        bool
@@ -909,7 +951,9 @@ config ARCH_T1024
        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
@@ -929,7 +973,9 @@ config ARCH_T1040
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
        imply CMD_MTDPARTS
+       imply CMD_NAND
        imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_T1042
        bool
@@ -949,7 +995,9 @@ config ARCH_T1042
        select SYS_FSL_SEC_COMPAT_5
        select FSL_IFC
        imply CMD_MTDPARTS
+       imply CMD_NAND
        imply CMD_SATA
+       imply CMD_REGINFO
 
 config ARCH_T2080
        bool
@@ -973,6 +1021,8 @@ config ARCH_T2080
        select SYS_PPC64
        select FSL_IFC
        imply CMD_SATA
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_T2081
        bool
@@ -993,6 +1043,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
@@ -1015,6 +1067,8 @@ config ARCH_T4160
        select SYS_PPC64
        select FSL_IFC
        imply CMD_SATA
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config ARCH_T4240
        bool
@@ -1040,6 +1094,8 @@ config ARCH_T4240
        select SYS_PPC64
        select FSL_IFC
        imply CMD_SATA
+       imply CMD_NAND
+       imply CMD_REGINFO
 
 config BOOKE
        bool
@@ -1053,6 +1109,7 @@ config E500
 
 config E500MC
        bool
+       imply CMD_PCI
        help
                Enble PowerPC E500MC core