AMD SB800: Drop component prefix from filenames.

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

diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c
index a43101235b4e273e79cbc2e0466f4228a2b58571..3f4657fa8f2b5b8f9773e199ee25cb63c7dfa758 100644 (file)
--- a/src/lib/ramtest.c
+++ b/src/lib/ramtest.c
@@ -1,4 +1,6 @@
+#include <stdint.h>
 #include <lib.h> /* Prototypes */
+#include <console/console.h>
 
 static void write_phys(unsigned long addr, u32 value)
 {
@@ -48,22 +50,22 @@ static void phys_memory_barrier(void)
 static void ram_fill(unsigned long start, unsigned long stop)
 {
        unsigned long addr;
-       /* 
+       /*
         * Fill.
         */
-#if CONFIG_USE_PRINTK_IN_CAR
-       printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\r\n", start, stop);
+#if CONFIG_CACHE_AS_RAM
+       printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop);
 #else
        print_debug("DRAM fill: ");
        print_debug_hex32(start);
        print_debug("-");
        print_debug_hex32(stop);
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        for(addr = start; addr < stop ; addr += 4) {
                /* Display address being filled */
                if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_CACHE_AS_RAM
                        printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
                        print_debug_hex32(addr);
@@ -73,11 +75,11 @@ static void ram_fill(unsigned long start, unsigned long stop)
                write_phys(addr, (u32)addr);
        };
        /* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
-       printk(BIOS_DEBUG, "%08lx\r\nDRAM filled\r\n", addr);
+#if CONFIG_CACHE_AS_RAM
+       printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
 #else
        print_debug_hex32(addr);
-       print_debug("\r\nDRAM filled\r\n");
+       print_debug("\nDRAM filled\n");
 #endif
 }
 
@@ -85,23 +87,23 @@ static void ram_verify(unsigned long start, unsigned long stop)
 {
        unsigned long addr;
        int i = 0;
-       /* 
+       /*
         * Verify.
         */
-#if CONFIG_USE_PRINTK_IN_CAR
-       printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\r\n", start, stop);
+#if CONFIG_CACHE_AS_RAM
+       printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop);
 #else
        print_debug("DRAM verify: ");
        print_debug_hex32(start);
        print_debug_char('-');
        print_debug_hex32(stop);
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        for(addr = start; addr < stop ; addr += 4) {
                unsigned long value;
                /* Display address being tested */
                if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_CACHE_AS_RAM
                        printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
                        print_debug_hex32(addr);
@@ -111,46 +113,46 @@ static void ram_verify(unsigned long start, unsigned long stop)
                value = read_phys(addr);
                if (value != addr) {
                        /* Display address with error */
-#if CONFIG_USE_PRINTK_IN_CAR
-                       printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\r\n", addr, value);
+#if CONFIG_CACHE_AS_RAM
+                       printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value);
 #else
                        print_err("Fail: @0x");
                        print_err_hex32(addr);
                        print_err(" Read value=0x");
                        print_err_hex32(value);
-                       print_err("\r\n");
+                       print_err("\n");
 #endif
                        i++;
                        if(i>256) {
-#if CONFIG_USE_PRINTK_IN_CAR
-                               printk(BIOS_DEBUG, "Aborting.\n\r");
+#if CONFIG_CACHE_AS_RAM
+                               printk(BIOS_DEBUG, "Aborting.\n");
 #else
-                               print_debug("Aborting.\n\r");
+                               print_debug("Aborting.\n");
 #endif
                                break;
                        }
                }
        }
        /* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_CACHE_AS_RAM
        printk(BIOS_DEBUG, "%08lx", addr);
 #else
        print_debug_hex32(addr);
 #endif
 
        if (i) {
-#if CONFIG_USE_PRINTK_IN_CAR
-               printk(BIOS_DEBUG, "\r\nDRAM did _NOT_ verify!\r\n");
+#if CONFIG_CACHE_AS_RAM
+               printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n");
 #else
-               print_debug("\r\nDRAM did _NOT_ verify!\r\n");
+               print_debug("\nDRAM did _NOT_ verify!\n");
 #endif
                die("DRAM ERROR");
        }
        else {
-#if CONFIG_USE_PRINTK_IN_CAR
-               printk(BIOS_DEBUG, "\r\nDRAM range verified.\r\n");
+#if CONFIG_CACHE_AS_RAM
+               printk(BIOS_DEBUG, "\nDRAM range verified.\n");
 #else
-               print_debug("\r\nDRAM range verified.\r\n");
+               print_debug("\nDRAM range verified.\n");
 #endif
        }
 }
@@ -163,23 +165,23 @@ void ram_check(unsigned long start, unsigned long stop)
         * test than a "Is my DRAM faulty?" test.  Not all bits
         * are tested.   -Tyson
         */
-#if CONFIG_USE_PRINTK_IN_CAR
-       printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\r\n", start, stop);
+#if CONFIG_CACHE_AS_RAM
+       printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop);
 #else
        print_debug("Testing DRAM : ");
        print_debug_hex32(start);
-       print_debug("-");       
+       print_debug("-");
        print_debug_hex32(stop);
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        ram_fill(start, stop);
        /* Make sure we don't read before we wrote */
        phys_memory_barrier();
        ram_verify(start, stop);
-#if CONFIG_USE_PRINTK_IN_CAR
-       printk(BIOS_DEBUG, "Done.\r\n");
+#if CONFIG_CACHE_AS_RAM
+       printk(BIOS_DEBUG, "Done.\n");
 #else
-       print_debug("Done.\r\n");
+       print_debug("Done.\n");
 #endif
 }