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 ec7a2cffacf01430485da171a33142ee9de5f1f6..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
 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_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_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_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_SB1xxx_SOC
 
 config SIBYTE_BCM112X
        bool
        select SIBYTE_SB1xxx_SOC

+       select SIBYTE_HAS_ZBUS_PROFILING

 
 config SIBYTE_BCM1x80
        bool
        select HW_HAS_PCI
 
 config SIBYTE_BCM1x80
        bool
        select HW_HAS_PCI

+       select SIBYTE_HAS_ZBUS_PROFILING

        select SIBYTE_SB1xxx_SOC
        select SYS_SUPPORTS_SMP
 
        select SIBYTE_SB1xxx_SOC
        select SYS_SUPPORTS_SMP
 


@@ -37,11 +43,11 @@ config SIBYTE_BCM1x55
        bool
        select HW_HAS_PCI
        select SIBYTE_SB1xxx_SOC
        bool
        select HW_HAS_PCI
        select SIBYTE_SB1xxx_SOC

+       select SIBYTE_HAS_ZBUS_PROFILING

        select SYS_SUPPORTS_SMP
 
 config SIBYTE_SB1xxx_SOC
        bool
        select SYS_SUPPORTS_SMP
 
 config SIBYTE_SB1xxx_SOC
        bool

-       depends on EXPERIMENTAL

        select DMA_COHERENT
        select SIBYTE_CFE
        select SWAP_IO_SPACE
        select DMA_COHERENT
        select SIBYTE_CFE
        select SWAP_IO_SPACE


@@ -95,8 +101,10 @@ config CPU_SB1_PASS_2
 
 config SIBYTE_HAS_LDT
        bool
 
 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"
 
 config SIMULATION
        bool "Running under simulation"


@@ -116,6 +124,7 @@ config SB1_CERR_STALL
 config SIBYTE_CFE
        bool "Booting from CFE"
        depends on SIBYTE_SB1xxx_SOC
 config SIBYTE_CFE
        bool "Booting from CFE"
        depends on SIBYTE_SB1xxx_SOC

+       select SYS_HAS_EARLY_PRINTK

        help
          Make use of the CFE API for enumerating available memory,
          controlling secondary CPUs, and possibly console output.
        help
          Make use of the CFE API for enumerating available memory,
          controlling secondary CPUs, and possibly console output.


@@ -131,6 +140,7 @@ config SIBYTE_CFE_CONSOLE
 config SIBYTE_STANDALONE
        bool
        depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
 config SIBYTE_STANDALONE
        bool
        depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE

+       select SYS_HAS_EARLY_PRINTK

        default y
 
 config SIBYTE_STANDALONE_RAM_SIZE
        default y
 
 config SIBYTE_STANDALONE_RAM_SIZE


@@ -160,5 +170,8 @@ config SIBYTE_SB1250_PROF
        depends on SIBYTE_SB1xxx_SOC
 
 config SIBYTE_TBPROF
        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