Merge Linux 2.6.23

[linux-2.6-omap-h63xx.git] / arch / mips / sibyte / Kconfig

diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index 67dac6204b6da32cc9d76880ab5874716c80cd8d..fdd7bd98fb449521883810551e696e3d1a56f950 100644 (file)
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -1,35 +1,41 @@
 config SIBYTE_SB1250
        bool
        select HW_HAS_PCI
-       select SIBYTE_HAS_LDT
+       select SIBYTE_ENABLE_LDT_IF_PCI
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SIBYTE_SB1xxx_SOC
        select SYS_SUPPORTS_SMP
 
 config SIBYTE_BCM1120
        bool
        select SIBYTE_BCM112X
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SIBYTE_SB1xxx_SOC
 
 config SIBYTE_BCM1125
        bool
        select HW_HAS_PCI
        select SIBYTE_BCM112X
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SIBYTE_SB1xxx_SOC
 
 config SIBYTE_BCM1125H
        bool
        select HW_HAS_PCI
        select SIBYTE_BCM112X
-       select SIBYTE_HAS_LDT
+       select SIBYTE_ENABLE_LDT_IF_PCI
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SIBYTE_SB1xxx_SOC
 
 config SIBYTE_BCM112X
        bool
        select SIBYTE_SB1xxx_SOC
+       select SIBYTE_HAS_ZBUS_PROFILING
 
 config SIBYTE_BCM1x80
        bool
        select HW_HAS_PCI
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SIBYTE_SB1xxx_SOC
        select SYS_SUPPORTS_SMP
 
@@ -37,11 +43,11 @@ config SIBYTE_BCM1x55
        bool
        select HW_HAS_PCI
        select SIBYTE_SB1xxx_SOC
+       select SIBYTE_HAS_ZBUS_PROFILING
        select SYS_SUPPORTS_SMP
 
 config SIBYTE_SB1xxx_SOC
        bool
-       depends on EXPERIMENTAL
        select DMA_COHERENT
        select SIBYTE_CFE
        select SWAP_IO_SPACE
@@ -95,8 +101,10 @@ config CPU_SB1_PASS_2
 
 config SIBYTE_HAS_LDT
        bool
-       depends on PCI && (SIBYTE_SB1250 || SIBYTE_BCM1125H)
-       default y
+
+config SIBYTE_ENABLE_LDT_IF_PCI
+       bool
+       select SIBYTE_HAS_LDT if PCI
 
 config SIMULATION
        bool "Running under simulation"
@@ -162,5 +170,8 @@ config SIBYTE_SB1250_PROF
        depends on SIBYTE_SB1xxx_SOC
 
 config SIBYTE_TBPROF
-       bool "Support for ZBbus profiling"
-       depends on SIBYTE_SB1xxx_SOC
+       tristate "Support for ZBbus profiling"
+       depends on SIBYTE_HAS_ZBUS_PROFILING
+
+config SIBYTE_HAS_ZBUS_PROFILING
+       bool