Move CONFIG_PANIC_HANG 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 ccdf103..19e8d02 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"
@@ -30,6 +29,7 @@ config TARGET_B4420QDS
        select ARCH_B4420
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_B4860QDS
        bool "Support B4860QDS"
@@ -37,6 +37,7 @@ config TARGET_B4860QDS
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        select SUPPORT_SPL
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_BSC9131RDB
        bool "Support BSC9131RDB"
@@ -58,6 +59,7 @@ config TARGET_C29XPCIE
        select SUPPORT_SPL
        select SUPPORT_TPL
        select PHYS_64BIT
+       imply PANIC_HANG
 
 config TARGET_P3041DS
        bool "Support P3041DS"
@@ -65,6 +67,7 @@ config TARGET_P3041DS
        select ARCH_P3041
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P4080DS
        bool "Support P4080DS"
@@ -72,6 +75,7 @@ config TARGET_P4080DS
        select ARCH_P4080
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P5020DS
        bool "Support P5020DS"
@@ -79,6 +83,7 @@ config TARGET_P5020DS
        select ARCH_P5020
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P5040DS
        bool "Support P5040DS"
@@ -86,6 +91,7 @@ config TARGET_P5040DS
        select ARCH_P5040
        select BOARD_LATE_INIT if CHAIN_OF_TRUST
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_MPC8536DS
        bool "Support MPC8536DS"
@@ -93,6 +99,7 @@ config TARGET_MPC8536DS
 # Use DDR3 controller with DDR2 DIMMs on this board
        select SYS_FSL_DDRC_GEN3
        imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_MPC8541CDS
        bool "Support MPC8541CDS"
@@ -101,11 +108,11 @@ config TARGET_MPC8541CDS
 config TARGET_MPC8544DS
        bool "Support MPC8544DS"
        select ARCH_MPC8544
+       imply PANIC_HANG
 
 config TARGET_MPC8548CDS
        bool "Support MPC8548CDS"
        select ARCH_MPC8548
-       imply ENV_IS_IN_FLASH
 
 config TARGET_MPC8555CDS
        bool "Support MPC8555CDS"
@@ -125,6 +132,7 @@ config TARGET_MPC8572DS
 # 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"
@@ -134,6 +142,7 @@ config TARGET_P1010RDB_PA
        select SUPPORT_TPL
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1010RDB_PB
        bool "Support P1010RDB_PB"
@@ -143,6 +152,7 @@ config TARGET_P1010RDB_PB
        select SUPPORT_TPL
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1022DS
        bool "Support P1022DS"
@@ -150,11 +160,13 @@ config TARGET_P1022DS
        select SUPPORT_SPL
        select SUPPORT_TPL
        imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_P1023RDB
        bool "Support P1023RDB"
        select ARCH_P1023
        imply CMD_EEPROM
+       imply PANIC_HANG
 
 config TARGET_P1020MBG
        bool "Support P1020MBG-PC"
@@ -163,6 +175,7 @@ config TARGET_P1020MBG
        select ARCH_P1020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020RDB_PC
        bool "Support P1020RDB-PC"
@@ -171,6 +184,7 @@ config TARGET_P1020RDB_PC
        select ARCH_P1020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020RDB_PD
        bool "Support P1020RDB-PD"
@@ -179,6 +193,7 @@ config TARGET_P1020RDB_PD
        select ARCH_P1020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1020UTM
        bool "Support P1020UTM"
@@ -187,6 +202,7 @@ config TARGET_P1020UTM
        select ARCH_P1020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1021RDB
        bool "Support P1021RDB"
@@ -195,6 +211,7 @@ config TARGET_P1021RDB
        select ARCH_P1021
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1024RDB
        bool "Support P1024RDB"
@@ -203,6 +220,7 @@ config TARGET_P1024RDB
        select ARCH_P1024
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_P1025RDB
        bool "Support P1025RDB"
@@ -211,6 +229,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 +238,7 @@ config TARGET_P2020RDB
        select ARCH_P2020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P1_TWR
        bool "Support p1_twr"
@@ -230,6 +250,7 @@ config TARGET_P2041RDB
        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"
@@ -244,6 +265,7 @@ config TARGET_T1024QDS
        select PHYS_64BIT
        imply CMD_EEPROM
        imply CMD_SATA
+       imply FSL_SATA
 
 config TARGET_T1023RDB
        bool "Support T1023RDB"
@@ -252,6 +274,7 @@ config TARGET_T1023RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_EEPROM
+       imply PANIC_HANG
 
 config TARGET_T1024RDB
        bool "Support T1024RDB"
@@ -260,6 +283,7 @@ config TARGET_T1024RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_EEPROM
+       imply PANIC_HANG
 
 config TARGET_T1040QDS
        bool "Support T1040QDS"
@@ -268,6 +292,7 @@ config TARGET_T1040QDS
        select PHYS_64BIT
        imply CMD_EEPROM
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1040RDB
        bool "Support T1040RDB"
@@ -276,6 +301,7 @@ config TARGET_T1040RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1040D4RDB
        bool "Support T1040D4RDB"
@@ -284,6 +310,7 @@ config TARGET_T1040D4RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1042RDB
        bool "Support T1042RDB"
@@ -300,6 +327,7 @@ config TARGET_T1042D4RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T1042RDB_PI
        bool "Support T1042RDB_PI"
@@ -308,6 +336,7 @@ config TARGET_T1042RDB_PI
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T2080QDS
        bool "Support T2080QDS"
@@ -324,6 +353,7 @@ config TARGET_T2080RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T2081QDS
        bool "Support T2081QDS"
@@ -338,12 +368,14 @@ config TARGET_T4160QDS
        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"
@@ -352,6 +384,7 @@ config TARGET_T4240QDS
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_T4240RDB
        bool "Support T4240RDB"
@@ -359,6 +392,7 @@ config TARGET_T4240RDB
        select SUPPORT_SPL
        select PHYS_64BIT
        imply CMD_SATA
+       imply PANIC_HANG
 
 config TARGET_CONTROLCENTERD
        bool "Support controlcenterd"
@@ -389,16 +423,19 @@ 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
 
@@ -565,7 +602,6 @@ 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
@@ -616,7 +652,6 @@ config ARCH_MPC8572
        select SYS_PPC_E500_USE_DEBUG_TLB
        select FSL_ELBC
        imply CMD_NAND
-       imply ENV_IS_IN_FLASH
 
 config ARCH_P1010
        bool
@@ -644,6 +679,7 @@ config ARCH_P1010
        imply CMD_SATA
        imply CMD_PCI
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P1011
        bool
@@ -676,6 +712,7 @@ config ARCH_P1020
        imply CMD_SATA
        imply CMD_PCI
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1021
        bool
@@ -694,6 +731,7 @@ config ARCH_P1021
        imply CMD_NAND
        imply CMD_SATA
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1022
        bool
@@ -741,6 +779,7 @@ config ARCH_P1024
        imply CMD_SATA
        imply CMD_PCI
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1025
        bool
@@ -825,6 +864,7 @@ config ARCH_P3041
        imply CMD_NAND
        imply CMD_SATA
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P4080
        bool
@@ -862,6 +902,7 @@ config ARCH_P4080
        select FSL_ELBC
        imply CMD_SATA
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P5020
        bool
@@ -885,6 +926,7 @@ config ARCH_P5020
        select FSL_ELBC
        imply CMD_SATA
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_P5040
        bool
@@ -908,6 +950,7 @@ config ARCH_P5040
        select FSL_ELBC
        imply CMD_SATA
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_QEMU_E500
        bool
@@ -974,6 +1017,7 @@ config ARCH_T1040
        imply CMD_NAND
        imply CMD_SATA
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T1042
        bool
@@ -996,6 +1040,7 @@ config ARCH_T1042
        imply CMD_NAND
        imply CMD_SATA
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T2080
        bool
@@ -1021,6 +1066,7 @@ config ARCH_T2080
        imply CMD_SATA
        imply CMD_NAND
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T2081
        bool
@@ -1067,6 +1113,7 @@ config ARCH_T4160
        imply CMD_SATA
        imply CMD_NAND
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config ARCH_T4240
        bool
@@ -1094,6 +1141,7 @@ config ARCH_T4240
        imply CMD_SATA
        imply CMD_NAND
        imply CMD_REGINFO
+       imply FSL_SATA
 
 config BOOKE
        bool