Various CONFIG_DEBUG_RAM_SETUP related fixes (trivial).

Some boards still used the old DEBUG_RAM_SETUP (without _CONFIG prefix).

Also, consistently use "#if CONFIG_DEBUG_RAM_SETUP" (not #ifdef) as we do
elsewhere.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5843 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 7c55d0c591d1157b610f98bf62e61b7af3bc9c4a..0809926c704ecaf28cbd43f27c74e34f34c5e643 100644 (file)
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -379,7 +379,7 @@ void main(unsigned long bist)
 
 #if CONFIG_HAVE_ACPI_RESUME == 0
        /* When doing resume, we must not overwrite RAM */
-#if defined(DEBUG_RAM_SETUP)
+#if CONFIG_DEBUG_RAM_SETUP
        sdram_dump_mchbar_registers();
 
        {

diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 0b5c9c9cdbe822ae61c818a3f614711c39ade4a2..337d8567586704aa206823899fd72ea80db4792d 100644 (file)
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -295,7 +295,7 @@ void main(unsigned long bist)
 
 #if !CONFIG_HAVE_ACPI_RESUME
 #if CONFIG_DEFAULT_CONSOLE_LOGLEVEL > 8
-#if defined(DEBUG_RAM_SETUP)
+#if CONFIG_DEBUG_RAM_SETUP
        sdram_dump_mchbar_registers();
 #endif
 

diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index a3e96651aaf6c86397b1c123b4f6d1db685a1c15..1fdcd0b7bac9b03e915cf21dc63f1b623c2ac08e 100644 (file)
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -355,7 +355,7 @@ void main(unsigned long bist)
 
 #if !CONFIG_HAVE_ACPI_RESUME
 #if CONFIG_DEFAULT_CONSOLE_LOGLEVEL > 8
-#if defined(DEBUG_RAM_SETUP)
+#if CONFIG_DEBUG_RAM_SETUP
        sdram_dump_mchbar_registers();
 
        {

diff --git a/src/northbridge/intel/i440lx/Kconfig b/src/northbridge/intel/i440lx/Kconfig
index cff3aac2d25d82d01991e7bfb7555789ff37be14..e7119c5817613c38651ec25805c16058b8e87115 100644 (file)
--- a/src/northbridge/intel/i440lx/Kconfig
+++ b/src/northbridge/intel/i440lx/Kconfig
@@ -19,4 +19,5 @@
 
 config NORTHBRIDGE_INTEL_I440LX
        bool
+       select HAVE_DEBUG_RAM_SETUP
 

diff --git a/src/northbridge/intel/i440lx/raminit.c b/src/northbridge/intel/i440lx/raminit.c
index d8cebb28081b1d86be2ac5a2293e34677a55fc59..dcb22732f29cbe98be22bb75031f8eb3e65ef490 100644 (file)
--- a/src/northbridge/intel/i440lx/raminit.c
+++ b/src/northbridge/intel/i440lx/raminit.c
@@ -31,7 +31,7 @@ Macros and definitions.
 /* Uncomment this to enable debugging output. */
 
 /* Debugging macros. */
-#if defined(DEBUG_RAM_SETUP)
+#if CONFIG_DEBUG_RAM_SETUP
 #define PRINT_DEBUG(x)         print_debug(x)
 #define PRINT_DEBUG_HEX8(x)    print_debug_hex8(x)
 #define PRINT_DEBUG_HEX16(x)   print_debug_hex16(x)
@@ -215,7 +215,7 @@ static void northbridge_init(void)
        reg32 &= 0xe8000000U;
        pci_write_config32(NB, APBASE, reg32);
 
-       #ifdef DEBUG_RAM_SETUP
+#if CONFIG_DEBUG_RAM_SETUP
        /*
         * apbase dont get set still, no idea what i have doing wrong yet,
         * i am almost sure that somehow i set it by mistake once, but can't
@@ -225,7 +225,7 @@ static void northbridge_init(void)
        PRINT_DEBUG("APBASE ");
        PRINT_DEBUG_HEX32(reg32);
        PRINT_DEBUG("\n");
-       #endif
+#endif
 }
 
 
@@ -265,7 +265,7 @@ static void sdram_set_registers(void)
                 * i am not sure if that is needed, but was usefull
                 * for me to confirm what got written
                 */
-#ifdef DEBUG_RAM_SETUP
+#if CONFIG_DEBUG_RAM_SETUP
                PRINT_DEBUG("    Set register 0x");
                PRINT_DEBUG_HEX8(register_values[i]);
                PRINT_DEBUG(" to 0x");

diff --git a/src/northbridge/via/vt8601/Kconfig b/src/northbridge/via/vt8601/Kconfig
index cb64dbcb31aeafd88f3cb0cc36135723eb147aed..1b202679ab054c696b921247f2d5808baa0ea151 100644 (file)
--- a/src/northbridge/via/vt8601/Kconfig
+++ b/src/northbridge/via/vt8601/Kconfig
@@ -1,3 +1,4 @@
 config NORTHBRIDGE_VIA_VT8601
        bool
+       select HAVE_DEBUG_RAM_SETUP
 

diff --git a/src/northbridge/via/vt8601/raminit.c b/src/northbridge/via/vt8601/raminit.c
index 2365b8d8fb6a283034c9be5077fc6f10ef697a64..f1ebbe5338756ba632837a6417d90507e36975fa 100644 (file)
--- a/src/northbridge/via/vt8601/raminit.c
+++ b/src/northbridge/via/vt8601/raminit.c
@@ -69,7 +69,7 @@ static void dimms_write(int x)
        }
 }
 
-#ifdef CONFIG_DEBUG_RAM_SETUP
+#if CONFIG_DEBUG_RAM_SETUP
 static void dumpnorth(device_t north)
 {
        unsigned int r, c;