Drop \r\n and \n\r as both print_XXX and printk now do this internally.

[coreboot.git] / src / northbridge / amd / amdk8 / setup_resource_map.c

diff --git a/src/northbridge/amd/amdk8/setup_resource_map.c b/src/northbridge/amd/amdk8/setup_resource_map.c
index 1a82f6b3b0bd39c806a7c5cb9ee991a7764d4e1f..ec3c0cf9199508a408d28c4905bb428cf6dba2ab 100644 (file)
--- a/src/northbridge/amd/amdk8/setup_resource_map.c
+++ b/src/northbridge/amd/amdk8/setup_resource_map.c
@@ -5,21 +5,14 @@ static void setup_resource_map_offset(const unsigned int *register_values, int m
        int i;
 //      print_debug("setting up resource map offset....");
 #if 0
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        for(i = 0; i < max; i += 3) {
                device_t dev;
                unsigned where;
                unsigned long reg;
 #if 0
-       #if CONFIG_USE_PRINTK_IN_CAR
-               prink_debug("%08x <- %08x\r\n", register_values[i] +  offset_pci_dev, register_values[i+2]);
-       #else
-               print_debug_hex32(register_values[i] + offset_pci_dev);
-               print_debug(" <-");
-               print_debug_hex32(register_values[i+2]);
-               print_debug("\r\n");
-       #endif
+               prink_debug("%08x <- %08x\n", register_values[i] +  offset_pci_dev, register_values[i+2]);
 #endif
                dev = (register_values[i] & ~0xfff) + offset_pci_dev;
                where = register_values[i] & 0xfff;
@@ -34,7 +27,7 @@ static void setup_resource_map_offset(const unsigned int *register_values, int m
                pci_write_config32(register_values[i], reg);
 #endif
        }
-//      print_debug("done.\r\n");
+//      print_debug("done.\n");
 }
 
 #define RES_PCI_IO 0x10
@@ -52,31 +45,16 @@ static void setup_resource_map_x_offset(const unsigned int *register_values, int
 #endif
 
 #if RES_DEBUG
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        for(i = 0; i < max; i += 4) {
 #if RES_DEBUG
-       #if CONFIG_USE_PRINTK_IN_CAR
-               printk_debug("%04x: %02x %08x <- & %08x | %08x\r\n",
+               printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n",
                        i>>2, register_values[i],
                        register_values[i+1] + ( (register_values[i]==RES_PCI_IO) ? offset_pci_dev : 0),
                        register_values[i+2],
                        register_values[i+3] + ( ( (register_values[i] & RES_PORT_IO_32) == RES_PORT_IO_32) ? offset_io_base : 0)
                        );
-       #else
-               print_debug_hex16(i>>2);
-               print_debug(": ");
-               print_debug_hex8(register_values[i]);
-               print_debug(" ");
-               print_debug_hex32(register_values[i+1] + ( (register_values[i]==RES_PCI_IO) ? offset_pci_dev : 0) );
-               print_debug(" <- & ");
-               print_debug_hex32(register_values[i+2]);
-               print_debug(" | ");
-               print_debug_hex32(register_values[i+3] +
-                       (((register_values[i] & RES_PORT_IO_32) == RES_PORT_IO_32) ? offset_io_base : 0)
-                       );
-               print_debug("\r\n");
-       #endif
 #endif
                switch (register_values[i]) {
                case RES_PCI_IO: //PCI
@@ -134,7 +112,7 @@ static void setup_resource_map_x_offset(const unsigned int *register_values, int
        }
 
 #if RES_DEBUG
-       print_debug("done.\r\n");
+       print_debug("done.\n");
 #endif
 }
 static void setup_resource_map_x(const unsigned int *register_values, int max)
@@ -147,25 +125,12 @@ static void setup_resource_map_x(const unsigned int *register_values, int max)
 #endif
 
 #if RES_DEBUG
-       print_debug("\r\n");
+       print_debug("\n");
 #endif
        for(i = 0; i < max; i += 4) {
 #if RES_DEBUG
-       #if CONFIG_USE_PRINTK_IN_CAR
-               printk_debug("%04x: %02x %08x <- & %08x | %08x\r\n",
+               printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n",
                        i/4, register_values[i],register_values[i+1], register_values[i+2], register_values[i+3]);
-       #else
-               print_debug_hex16(i/4);
-               print_debug(": ");
-               print_debug_hex8(register_values[i]);
-               print_debug(" ");
-               print_debug_hex32(register_values[i+1]);
-               print_debug(" <- & ");
-               print_debug_hex32(register_values[i+2]);
-               print_debug(" | ");
-               print_debug_hex32(register_values[i+3]);
-               print_debug("\r\n");
-       #endif
 #endif
                switch (register_values[i]) {
                case RES_PCI_IO: //PCI
@@ -223,7 +188,7 @@ static void setup_resource_map_x(const unsigned int *register_values, int max)
        }
 
 #if RES_DEBUG
-       print_debug("done.\r\n");
+       print_debug("done.\n");
 #endif
 }
 
@@ -258,7 +223,7 @@ static void setup_iob_resource_map(const unsigned int *register_values, int max)
                print_debug(" -> ");
                reg = inb(where);
                print_debug_hex8(reg);
-               print_debug("\r\n");
+               print_debug("\n");
 #endif
        }
 }
@@ -297,7 +262,7 @@ static void setup_io_resource_map(const unsigned int *register_values, int max)
                print_debug(" -> ");
                reg = inl(where);
                print_debug_hex32(reg);
-               print_debug("\r\n");
+               print_debug("\n");
 #endif
        }
 }
@@ -324,7 +289,7 @@ static void setup_mem_resource_map(const unsigned int *register_values, int max)
                print_debug(" RB ");
                reg = read32(where);
                print_debug_hex32(reg);
-               print_debug("\r\n");
+               print_debug("\n");
 #endif
        }
 }