14 files changed, 25 insertions, 18 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 0995e1a36e..5dde389edb 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -509,19 +509,13 @@ config GDB_STUB
 	  If enabled, you will be able to set breakpoints for gdb debugging.
 	  See src/arch/i386/lib/c_start.S for details.
 
+config HAVE_DEBUG_RAM_SETUP
+	def_bool n
+
 config DEBUG_RAM_SETUP
 	bool "Output verbose RAM init debug messages"
 	default n
-	depends on (NORTHBRIDGE_AMD_AMDFAM10 \
-		 || NORTHBRIDGE_AMD_AMDK8 \
-		 || NORTHBRIDGE_VIA_CN700 \
-		 || NORTHBRIDGE_VIA_CX700 \
-		 || NORTHBRIDGE_VIA_VX800 \
-		 || NORTHBRIDGE_INTEL_E7501 \
-		 || NORTHBRIDGE_INTEL_I440BX \
-		 || NORTHBRIDGE_INTEL_I82810 \
-		 || NORTHBRIDGE_INTEL_I82830 \
-		 || NORTHBRIDGE_INTEL_I945)
+	depends on HAVE_DEBUG_RAM_SETUP
 	help
 	  This option enables additional RAM init related debug messages.
 	  It is recommended to enable this when debugging issues on your
@@ -538,16 +532,13 @@ config DEBUG_PIRQ
 	help
 	  If unsure, say N.
 
+config HAVE_DEBUG_SMBUS
+	def_bool n
+
 config DEBUG_SMBUS
 	bool "Output verbose SMBus debug messages"
 	default n
-	depends on (SOUTHBRIDGE_VIA_VT8237R \
-		 || NORTHBRIDGE_VIA_VX800 \
-		 || NORTHBRIDGE_VIA_CX700 \
-		 || NORTHBRIDGE_AMD_AMDK8 \
-		 || NORTHBRIDGE_AMD_AMDFAM10 \
-		 || BOARD_LIPPERT_SPACERUNNER_LX \
-		 || SOUTHBRIDGE_VIA_VT8231)
+	depends on HAVE_DEBUG_SMBUS
 	help
 	  This option enables additional SMBus (and SPD) debug messages.
 
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index e1c989c7e6..700c04efbe 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -5,6 +5,7 @@ config BOARD_LIPPERT_SPACERUNNER_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
 	select SUPERIO_ITE_IT8712F
+	select HAVE_DEBUG_SMBUS
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index dd893f6bf8..8c41a75f7b 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -19,6 +19,8 @@
 
 config NORTHBRIDGE_AMD_AMDFAM10
 	bool
+	select HAVE_DEBUG_RAM_SETUP
+	select HAVE_DEBUG_SMBUS
 	select HAVE_HIGH_TABLES
 	select HYPERTRANSPORT_PLUGIN_SUPPORT
 	select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 88035aa6c8..a73246fa65 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -19,6 +19,8 @@
 
 config NORTHBRIDGE_AMD_AMDK8
 	bool
+	select HAVE_DEBUG_RAM_SETUP
+	select HAVE_DEBUG_SMBUS
 	select HAVE_HIGH_TABLES
 	select HYPERTRANSPORT_PLUGIN_SUPPORT
 
diff --git a/src/northbridge/intel/e7501/Kconfig b/src/northbridge/intel/e7501/Kconfig
index 4236684d34..3dd16dbec9 100644
--- a/src/northbridge/intel/e7501/Kconfig
+++ b/src/northbridge/intel/e7501/Kconfig
@@ -1,4 +1,5 @@
 config NORTHBRIDGE_INTEL_E7501
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig
index bb1b003d98..8fff69f34b 100644
--- a/src/northbridge/intel/i440bx/Kconfig
+++ b/src/northbridge/intel/i440bx/Kconfig
@@ -19,6 +19,7 @@
 
 config NORTHBRIDGE_INTEL_I440BX
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
 config SDRAMPWR_4DIMM
diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index 84cb0d6c44..414c784ec1 100644
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -19,6 +19,7 @@
 
 config NORTHBRIDGE_INTEL_I82810
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
 choice
diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig
index 21072a1c39..125633668d 100644
--- a/src/northbridge/intel/i82830/Kconfig
+++ b/src/northbridge/intel/i82830/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_INTEL_I82830
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
 choice
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index 041069a369..fb91fb0519 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -19,6 +19,7 @@
 
 config NORTHBRIDGE_INTEL_I945
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
 config FALLBACK_VGA_BIOS_ID
diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig
index 3fd9e8f67e..aa09869436 100644
--- a/src/northbridge/via/cn700/Kconfig
+++ b/src/northbridge/via/cn700/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_VIA_CN700
 	bool
+	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_HIGH_TABLES
 
 config FALLBACK_SIZE
diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig
index 916c4c3dc9..046adc7adc 100644
--- a/src/northbridge/via/cx700/Kconfig
+++ b/src/northbridge/via/cx700/Kconfig
@@ -1,5 +1,7 @@
 config NORTHBRIDGE_VIA_CX700
 	bool
+	select HAVE_DEBUG_RAM_SETUP
+	select HAVE_DEBUG_SMBUS
 	select HAVE_HIGH_TABLES
 	select HAVE_HARD_RESET
 	select IOAPIC
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig
index e4234b9556..89a33cff52 100644
--- a/src/northbridge/via/vx800/Kconfig
+++ b/src/northbridge/via/vx800/Kconfig
@@ -1,5 +1,7 @@
 config NORTHBRIDGE_VIA_VX800
 	bool
+	select HAVE_DEBUG_RAM_SETUP
+	select HAVE_DEBUG_SMBUS
 
 config FALLBACK_SIZE
 	int
diff --git a/src/southbridge/via/vt8231/Kconfig b/src/southbridge/via/vt8231/Kconfig
index ab391f7ff6..591ccb8a1b 100644
--- a/src/southbridge/via/vt8231/Kconfig
+++ b/src/southbridge/via/vt8231/Kconfig
@@ -19,4 +19,4 @@
 
 config SOUTHBRIDGE_VIA_VT8231
 	bool
-
+	select HAVE_DEBUG_SMBUS
diff --git a/src/southbridge/via/vt8237r/Kconfig b/src/southbridge/via/vt8237r/Kconfig
index b569de9a97..d0a6deb60c 100644
--- a/src/southbridge/via/vt8237r/Kconfig
+++ b/src/southbridge/via/vt8237r/Kconfig
@@ -19,6 +19,7 @@
 
 config SOUTHBRIDGE_VIA_VT8237R
 	bool
+	select HAVE_DEBUG_SMBUS
 	select IOAPIC
 
 config EPIA_VT8237R_INIT