CONFIG_DEBUG_RAM_SETUP and CONFIG_DEBUG_SMBUS are only available if the board /

chipset support it.  But this involves a long list of 'depends', which you have
to remember updating manually.  Converted this into HAVE_... properties, which
will be inherited automatically if someone copies a chipset to create a new
one.

Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5743 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 0995e1a36e733684a944d00ade60c9d437110a80..5dde389edba081eb5fc5c14620b14172f2cbcea4 100644 (file)
--- 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 e1c989c7e696add8e04567a1903a7d2601b12cb8..700c04efbe72aa0969a90a6b93bb19a4b3ef7646 100644 (file)
--- 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 dd893f6bf88078ef620f91e7481548b058631814..8c41a75f7ba96fcfc0ae9baa9b89a34e12405374 100644 (file)
--- 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 88035aa6c8b532159f66254b98988079999c130b..a73246fa65988037304532dbbb11a8e224b9979c 100644 (file)
--- 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 4236684d34babdf8e1a8b41628c882428ff17a31..3dd16dbec980dce7bb9d14cc5f40124a5a45a131 100644 (file)
--- 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 bb1b003d98565f3ccaf8f9ddc7480794e39bedc4..8fff69f34b68727509ed4c11fb86b6450faa61fc 100644 (file)
--- 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 84cb0d6c443c680394427f6e44b33086e912eccf..414c784ec1ec8db798dfcbe8fecbbe3b9e1059bc 100644 (file)
--- 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 21072a1c393419c4126db61bbd0c1617a5353ac7..125633668dd4aa3329844cb10cac7976a9b69f82 100644 (file)
--- 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 041069a369a714a43439f772fff142d648918938..fb91fb05195785dbff3faced1b8dab6f2fc96c89 100644 (file)
--- 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 3fd9e8f67ed8dc665ca8fcc928b1954cf9a63e82..aa09869436dcb8672c22e87cfc70b6d921914f8e 100644 (file)
--- 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 916c4c3dc95acb3d5d71a839eb7b569197d48263..046adc7adce26902731774fb37c81303f370a13f 100644 (file)
--- 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 e4234b9556a2025b1f80adb57f7721068924315f..89a33cff525f29de24a7294a21efb6c51b0b8904 100644 (file)
--- 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 ab391f7ff6f16cfb52a23f56d190df411987e6ea..591ccb8a1b503e06ace43db1de4cf4c602b10f94 100644 (file)
--- 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 b569de9a97ec863ac1941081108824f5b98110bc..d0a6deb60c316e65e7aa9b016fef723817bb3524 100644 (file)
--- 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