diff options
author | Myles Watson <mylesgw@gmail.com> | 2009-10-23 18:19:22 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2009-10-23 18:19:22 +0000 |
commit | 35ed0e7ea3d9bd6641c719cf4489bfa408e48972 (patch) | |
tree | e8ec60a597163536813a49c871e15002c97a37af /src/northbridge/amd/amdk8/debug.c | |
parent | 87f9514ab79340272ba4d06427ea2402cd6712d8 (diff) |
Remove PRINTK_IN_CAR tests from AMD files.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4826 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge/amd/amdk8/debug.c')
-rw-r--r-- | src/northbridge/amd/amdk8/debug.c | 154 |
1 files changed, 18 insertions, 136 deletions
diff --git a/src/northbridge/amd/amdk8/debug.c b/src/northbridge/amd/amdk8/debug.c index a445f253c7..55e232f95a 100644 --- a/src/northbridge/amd/amdk8/debug.c +++ b/src/northbridge/amd/amdk8/debug.c @@ -10,27 +10,14 @@ static inline void print_debug_addr(const char *str, void *val) { #if CACHE_AS_RAM_ADDRESS_DEBUG == 1 - #if CONFIG_USE_PRINTK_IN_CAR - printk_debug("------Address debug: %s%x------\r\n", str, val); - #else - print_debug ("------Address debug: "); print_debug(str); print_debug_hex32(val); print_debug("------\r\n"); - #endif + printk_debug("------Address debug: %s%x------\n", str, val); #endif } #if 1 static void print_debug_pci_dev(unsigned dev) { -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("PCI: %02x:%02x.%02x", (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7); -#else - print_debug("PCI: "); - print_debug_hex8((dev >> 20) & 0xff); - print_debug_char(':'); - print_debug_hex8((dev >> 15) & 0x1f); - print_debug_char('.'); - print_debug_hex8((dev >> 12) & 7); -#endif } static void print_pci_devices(void) @@ -47,13 +34,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug(" %04x:%04x\r\n", (id & 0xffff), (id>>16)); -#else - print_debug(" "); - print_debug_hex32(id); - print_debug("\r\n"); -#endif + printk_debug(" %04x:%04x\n", (id & 0xffff), (id>>16)); if(((dev>>12) & 0x07) == 0) { uint8_t hdr_type; hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE); @@ -72,23 +53,12 @@ static void dump_pci_device(unsigned dev) for(i = 0; i < 256; i++) { unsigned char val; if ((i & 0x0f) == 0) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%02x:",i); -#else - print_debug("\r\n"); - print_debug_hex8(i); - print_debug_char(':'); -#endif + printk_debug("\n%02x:",i); } val = pci_read_config8(dev, i); -#if CONFIG_USE_PRINTK_IN_CAR printk_debug(" %02x", val); -#else - print_debug_char(' '); - print_debug_hex8(val); -#endif } - print_debug("\r\n"); + print_debug("\n"); } #if CONFIG_K8_REV_F_SUPPORT == 1 @@ -102,25 +72,15 @@ static void dump_pci_device_index_wait(unsigned dev, uint32_t index_reg) for(i = 0; i < 0x40; i++) { uint32_t val; int j; -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%02x:",i); -#else - print_debug("\r\n"); - print_debug_hex8(i); - print_debug_char(':'); -#endif + printk_debug("\n%02x:",i); val = pci_read_config32_index_wait(dev, index_reg, i); for(j=0;j<4;j++) { -#if CONFIG_USE_PRINTK_IN_CAR printk_debug(" %02x", val & 0xff); -#else - print_debug_char(' '); print_debug_hex8(val&0xff); -#endif val >>= 8; } } - print_debug("\r\n"); + print_debug("\n"); } #endif @@ -182,98 +142,57 @@ static void dump_pci_devices_on_bus(unsigned busn) static void dump_spd_registers(const struct mem_controller *ctrl) { int i; - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i < 4; i++) { unsigned device; device = ctrl->channel0[i]; if (device) { int j; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("dimm: %02x.0: %02x", i, device); -#else - print_debug("dimm: "); - print_debug_hex8(i); - print_debug(".0: "); - print_debug_hex8(device); -#endif for(j = 0; j < 128; j++) { int status; unsigned char byte; if ((j & 0xf) == 0) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%02x: ", j); -#else - print_debug("\r\n"); - print_debug_hex8(j); - print_debug(": "); -#endif + printk_debug("\n%02x: ", j); } status = smbus_read_byte(device, j); if (status < 0) { break; } byte = status & 0xff; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("%02x ", byte); -#else - print_debug_hex8(byte); - print_debug_char(' '); -#endif } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { int j; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("dimm: %02x.1: %02x", i, device); -#else - print_debug("dimm: "); - print_debug_hex8(i); - print_debug(".1: "); - print_debug_hex8(device); -#endif for(j = 0; j < 128; j++) { int status; unsigned char byte; if ((j & 0xf) == 0) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%02x: ", j); -#else - print_debug("\r\n"); - print_debug_hex8(j); - print_debug(": "); -#endif + printk_debug("\n%02x: ", j); } status = smbus_read_byte(device, j); if (status < 0) { break; } byte = status & 0xff; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("%02x ", byte); -#else - print_debug_hex8(byte); - print_debug_char(' '); -#endif } - print_debug("\r\n"); + print_debug("\n"); } } } static void dump_smbus_registers(void) { unsigned device; - print_debug("\r\n"); + print_debug("\n"); for(device = 1; device < 0x80; device++) { int j; if( smbus_read_byte(device, 0) < 0 ) continue; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("smbus: %02x", device); -#else - print_debug("smbus: "); - print_debug_hex8(device); -#endif for(j = 0; j < 256; j++) { int status; unsigned char byte; @@ -282,23 +201,12 @@ static void dump_smbus_registers(void) break; } if ((j & 0xf) == 0) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%02x: ",j); -#else - print_debug("\r\n"); - print_debug_hex8(j); - print_debug(": "); -#endif + printk_debug("\n%02x: ",j); } byte = status & 0xff; -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("%02x ", byte); -#else - print_debug_hex8(byte); - print_debug_char(' '); -#endif } - print_debug("\r\n"); + print_debug("\n"); } } #endif @@ -308,31 +216,16 @@ static void dump_io_resources(unsigned port) int i; udelay(2000); -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("%04x:\r\n", port); -#else - print_debug_hex16(port); - print_debug(":\r\n"); -#endif + printk_debug("%04x:\n", port); for(i=0;i<256;i++) { uint8_t val; if ((i & 0x0f) == 0) { -#if CONFIG_USE_PRINTK_IN_CAR printk_debug("%02x:", i); -#else - print_debug_hex8(i); - print_debug_char(':'); -#endif } val = inb(port); -#if CONFIG_USE_PRINTK_IN_CAR printk_debug(" %02x",val); -#else - print_debug_char(' '); - print_debug_hex8(val); -#endif if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } port++; } @@ -344,21 +237,10 @@ static void dump_mem(unsigned start, unsigned end) print_debug("dump_mem:"); for(i=start;i<end;i++) { if((i & 0xf)==0) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\n%08x:", i); -#else - print_debug("\r\n"); - print_debug_hex32(i); - print_debug(":"); -#endif + printk_debug("\n%08x:", i); } -#if CONFIG_USE_PRINTK_IN_CAR printk_debug(" %02x", (unsigned char)*((unsigned char *)i)); -#else - print_debug(" "); - print_debug_hex8((unsigned char)*((unsigned char *)i)); -#endif } - print_debug("\r\n"); + print_debug("\n"); } #endif |