1 files changed, 16 insertions, 6 deletions

diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index 67dac6204b6d..bdf24a7b5494 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -1,31 +1,35 @@
 config SIBYTE_SB1250
         bool
         select HW_HAS_PCI
-        select SIBYTE_HAS_LDT
+        select SIBYTE_ENABLE_LDT_IF_PCI
         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
@@ -37,6 +41,7 @@ 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
@@ -95,8 +100,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 +169,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