CIMX wrapper: remove redudant traversing sb800 and sb900 CIMX dir

[coreboot.git] / src / lib / generic_sdram.c

diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c
index 7be053748480bb112409958c9cf96f9dd00ef498..efb61dbf7a2900bb72f77961ce30e7a166949468 100644 (file)
--- a/src/lib/generic_sdram.c
+++ b/src/lib/generic_sdram.c
@@ -1,20 +1,16 @@
 #include <lib.h> /* Prototypes */
 
-#ifndef RAMINIT_SYSINFO
-        #define RAMINIT_SYSINFO 0
-#endif
-
 static inline void print_debug_sdram_8(const char *strval, uint32_t val)
 {
-#if CONFIG_USE_INIT
-        printk_debug("%s%02x\r\n", strval, val);
+#if CONFIG_CACHE_AS_RAM
+        printk(BIOS_DEBUG, "%s%02x\n", strval, val);
 #else
-        print_debug(strval); print_debug_hex8(val); print_debug("\r\n");
+        print_debug(strval); print_debug_hex8(val); print_debug("\n");
 #endif
 }
 
 /* Setup SDRAM */
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo)
 #else
 void sdram_initialize(int controllers, const struct mem_controller *ctrl)
@@ -23,10 +19,10 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
        int i;
        /* Set the registers we can set once to reasonable values */
        for(i = 0; i < controllers; i++) {
-               print_debug_sdram_8("Ram1.",i);
+               print_debug_sdram_8("Ram1.", i);
 
-       #if RAMINIT_SYSINFO == 1
-               sdram_set_registers(ctrl + i , sysinfo);
+       #if CONFIG_RAMINIT_SYSINFO
+               sdram_set_registers(ctrl + i, sysinfo);
        #else
                sdram_set_registers(ctrl + i);
        #endif
@@ -34,10 +30,10 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
 
        /* Now setup those things we can auto detect */
        for(i = 0; i < controllers; i++) {
-                print_debug_sdram_8("Ram2.",i);
+                print_debug_sdram_8("Ram2.", i);
 
-       #if RAMINIT_SYSINFO == 1
-               sdram_set_spd_registers(ctrl + i , sysinfo);
+       #if CONFIG_RAMINIT_SYSINFO
+               sdram_set_spd_registers(ctrl + i, sysinfo);
        #else
                 sdram_set_spd_registers(ctrl + i);
        #endif
@@ -45,16 +41,16 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
        }
 
        /* Now that everything is setup enable the SDRAM.
-        * Some chipsets do the work for us while on others 
+        * Some chipsets do the work for us while on others
         * we need to it by hand.
         */
-       print_debug("Ram3\r\n");
+       print_debug("Ram3\n");
 
-       #if RAMINIT_SYSINFO == 1
+       #if CONFIG_RAMINIT_SYSINFO
        sdram_enable(controllers, ctrl, sysinfo);
        #else
        sdram_enable(controllers, ctrl);
        #endif
 
-       print_debug("Ram4\r\n");
+       print_debug("Ram4\n");
 }