From 64ed2b73451de4b655b3fdda0ff42825a165c317 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 31 Mar 2010 14:47:43 +0000 Subject: Drop \r\n and \n\r as both print_XXX and printk now do this internally. Only some assembler files still have \r\n ... Can we move that part to C completely? Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5342 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/supermicro/h8dme/ap_romstage.c | 2 +- src/mainboard/supermicro/h8dme/romstage.c | 20 ++++----- src/mainboard/supermicro/h8dmr/ap_romstage.c | 2 +- src/mainboard/supermicro/h8dmr/romstage.c | 8 ++-- src/mainboard/supermicro/x6dai_g/debug.c | 64 +++++++++++++-------------- src/mainboard/supermicro/x6dai_g/watchdog.c | 2 +- src/mainboard/supermicro/x6dhe_g/debug.c | 64 +++++++++++++-------------- src/mainboard/supermicro/x6dhe_g/watchdog.c | 2 +- src/mainboard/supermicro/x6dhe_g2/debug.c | 64 +++++++++++++-------------- src/mainboard/supermicro/x6dhe_g2/watchdog.c | 2 +- src/mainboard/supermicro/x6dhr_ig/debug.c | 64 +++++++++++++-------------- src/mainboard/supermicro/x6dhr_ig/watchdog.c | 2 +- src/mainboard/supermicro/x6dhr_ig2/debug.c | 64 +++++++++++++-------------- src/mainboard/supermicro/x6dhr_ig2/watchdog.c | 2 +- 14 files changed, 181 insertions(+), 181 deletions(-) (limited to 'src/mainboard/supermicro') diff --git a/src/mainboard/supermicro/h8dme/ap_romstage.c b/src/mainboard/supermicro/h8dme/ap_romstage.c index 05c62c3e2c..60dd1b275e 100644 --- a/src/mainboard/supermicro/h8dme/ap_romstage.c +++ b/src/mainboard/supermicro/h8dme/ap_romstage.c @@ -86,7 +86,7 @@ void hardwaremain(int ret_addr) id = get_node_core_id_x(); - print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\r\n"); + print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); train_ram(id.nodeid, sysinfo, sysinfox); diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c index 2edf58c39d..7f668f4c15 100644 --- a/src/mainboard/supermicro/h8dme/romstage.c +++ b/src/mainboard/supermicro/h8dme/romstage.c @@ -94,7 +94,7 @@ static void dump_smbus_registers(void) { u32 device; - print_debug("\r\n"); + print_debug("\n"); for (device = 1; device < 0x80; device++) { int j; if (smbus_read_byte(device, 0) < 0) @@ -108,12 +108,12 @@ static void dump_smbus_registers(void) break; } if ((j & 0xf) == 0) { - printk(BIOS_DEBUG, "\r\n%02x: ", j); + printk(BIOS_DEBUG, "\n%02x: ", j); } byte = status & 0xff; printk(BIOS_DEBUG, "%02x ", byte); } - print_debug("\r\n"); + print_debug("\n"); } } @@ -137,13 +137,13 @@ static inline void change_i2c_mux(unsigned device) smbus_send_byte(SMBUS_SWITCH1, device & 0x0f); smbus_send_byte_one(SMBUS_SWITCH2, (device >> 4) & 0x0f); int ret; - print_debug("change_i2c_mux i="); print_debug_hex8(device); print_debug("\r\n"); + print_debug("change_i2c_mux i="); print_debug_hex8(device); print_debug("\n"); dump_smbus_registers(); ret = smbus_send_byte(SMBUS_SWITCH1, device); - print_debug("change_i2c_mux ret="); print_debug_hex32(ret); print_debug("\r\n"); + print_debug("change_i2c_mux ret="); print_debug_hex32(ret); print_debug("\n"); dump_smbus_registers(); ret = smbus_send_byte_one(SMBUS_SWITCH2, device); - print_debug("change_i2c_mux ret="); print_debug_hex32(ret); print_debug("\r\n"); + print_debug("change_i2c_mux ret="); print_debug_hex32(ret); print_debug("\n"); dump_smbus_registers(); } */ @@ -273,7 +273,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); - print_debug("\r\n"); + print_debug("\n"); #if CONFIG_MEM_TRAIN_SEQ == 1 set_sysinfo_in_ram(0); // in BSP so could hold all ap until sysinfo is in ram @@ -303,7 +303,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) print_debug("begin msr fid, vid "); print_debug_hex32(msr.hi); print_debug_hex32(msr.lo); - print_debug("\r\n"); + print_debug("\n"); } @@ -320,7 +320,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) print_debug("end msr fid, vid "); print_debug_hex32(msr.hi); print_debug_hex32(msr.lo); - print_debug("\r\n"); + print_debug("\n"); } #endif @@ -332,7 +332,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) // fidvid change will issue one LDTSTOP and the HT change will be effective too if (needs_reset) { - print_info("ht reset -\r\n"); + print_info("ht reset -\n"); soft_reset(); } #endif diff --git a/src/mainboard/supermicro/h8dmr/ap_romstage.c b/src/mainboard/supermicro/h8dmr/ap_romstage.c index 05c62c3e2c..60dd1b275e 100644 --- a/src/mainboard/supermicro/h8dmr/ap_romstage.c +++ b/src/mainboard/supermicro/h8dmr/ap_romstage.c @@ -86,7 +86,7 @@ void hardwaremain(int ret_addr) id = get_node_core_id_x(); - print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\r\n"); + print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); train_ram(id.nodeid, sysinfo, sysinfox); diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c index a56f799c7a..7245b37fb2 100644 --- a/src/mainboard/supermicro/h8dmr/romstage.c +++ b/src/mainboard/supermicro/h8dmr/romstage.c @@ -202,7 +202,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) setup_mb_resource_map(); - print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n"); + print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\n"); #if CONFIG_MEM_TRAIN_SEQ == 1 set_sysinfo_in_ram(0); // in BSP so could hold all ap until sysinfo is in ram @@ -228,7 +228,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { msr_t msr; msr=rdmsr(0xc0010042); - print_debug("begin msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\r\n"); + print_debug("begin msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\n"); } @@ -242,7 +242,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { msr_t msr; msr=rdmsr(0xc0010042); - print_debug("end msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\r\n"); + print_debug("end msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\n"); } #endif @@ -254,7 +254,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) // fidvid change will issue one LDTSTOP and the HT change will be effective too if (needs_reset) { - print_info("ht reset -\r\n"); + print_info("ht reset -\n"); soft_reset(); } #endif diff --git a/src/mainboard/supermicro/x6dai_g/debug.c b/src/mainboard/supermicro/x6dai_g/debug.c index 5546421156..b4f2a185b3 100644 --- a/src/mainboard/supermicro/x6dai_g/debug.c +++ b/src/mainboard/supermicro/x6dai_g/debug.c @@ -12,7 +12,7 @@ static void print_reg(unsigned char index) print_debug_hex8(index); print_debug(": 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); return; } @@ -49,52 +49,52 @@ static void siodump(void) int i; unsigned char data; - print_debug("\r\n*** SERVER I/O REGISTERS ***\r\n"); + print_debug("\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\r\n*** XBUS REGISTERS ***\r\n"); + print_debug("\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** SERIAL 1 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\r\n*** SERIAL 2 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\r\n*** GPIO REGISTERS ***\r\n"); + print_debug("\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** GPIO VALUES ***\r\n"); + print_debug("\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\r\nGPDO 4: 0x"); + print_debug("\nGPDO 4: 0x"); print_debug_hex8(data); data = inb(0x68b); - print_debug("\r\nGPDI 4: 0x"); + print_debug("\nGPDI 4: 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); #if 0 - print_debug("\r\n*** WATCHDOG TIMER REGISTERS ***\r\n"); + print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\r\n*** FAN CONTROL REGISTERS ***\r\n"); + print_debug("\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\r\n*** RTC REGISTERS ***\r\n"); + print_debug("\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -104,7 +104,7 @@ static void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\r\n*** HEALTH MONITORING & CONTROL REGISTERS ***\r\n"); + print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -135,7 +135,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); } } @@ -143,7 +143,7 @@ static void dump_pci_device(unsigned dev) { int i; print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i <= 255; i++) { unsigned char val; @@ -155,7 +155,7 @@ static void dump_pci_device(unsigned dev) print_debug_char(' '); print_debug_hex8(val); if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } } } @@ -165,7 +165,7 @@ static void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\r\n"); + print_debug("BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { @@ -178,14 +178,14 @@ static void dump_bar14(unsigned dev) val = pci_read_config8(dev, i); #endif if((i%4)==0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex16(i); print_debug_char(' '); } print_debug_hex32(read32(bar + i)); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } static void dump_pci_devices(void) @@ -209,7 +209,7 @@ static void dump_pci_devices(void) 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]; @@ -223,20 +223,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { @@ -249,20 +249,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } } } @@ -275,14 +275,14 @@ void dump_spd_registers(void) while(device <= SMBUS_MEM_DEVICE_END) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("dimm "); print_debug_hex8(device); for(i = 0; (i < 256) ; i++) { unsigned char byte; if ((i % 16) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(i); print_debug(": "); } @@ -290,7 +290,7 @@ void dump_spd_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); @@ -308,7 +308,7 @@ void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("ipmi "); print_debug_hex8(device); @@ -318,7 +318,7 @@ void dump_ipmi_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); diff --git a/src/mainboard/supermicro/x6dai_g/watchdog.c b/src/mainboard/supermicro/x6dai_g/watchdog.c index 465ba4c7b3..2531bc2969 100644 --- a/src/mainboard/supermicro/x6dai_g/watchdog.c +++ b/src/mainboard/supermicro/x6dai_g/watchdog.c @@ -37,6 +37,6 @@ static void disable_esb6300_watchdog(void) static void disable_watchdogs(void) { disable_esb6300_watchdog(); - print_debug("Watchdogs disabled\r\n"); + print_debug("Watchdogs disabled\n"); } diff --git a/src/mainboard/supermicro/x6dhe_g/debug.c b/src/mainboard/supermicro/x6dhe_g/debug.c index 5546421156..b4f2a185b3 100644 --- a/src/mainboard/supermicro/x6dhe_g/debug.c +++ b/src/mainboard/supermicro/x6dhe_g/debug.c @@ -12,7 +12,7 @@ static void print_reg(unsigned char index) print_debug_hex8(index); print_debug(": 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); return; } @@ -49,52 +49,52 @@ static void siodump(void) int i; unsigned char data; - print_debug("\r\n*** SERVER I/O REGISTERS ***\r\n"); + print_debug("\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\r\n*** XBUS REGISTERS ***\r\n"); + print_debug("\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** SERIAL 1 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\r\n*** SERIAL 2 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\r\n*** GPIO REGISTERS ***\r\n"); + print_debug("\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** GPIO VALUES ***\r\n"); + print_debug("\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\r\nGPDO 4: 0x"); + print_debug("\nGPDO 4: 0x"); print_debug_hex8(data); data = inb(0x68b); - print_debug("\r\nGPDI 4: 0x"); + print_debug("\nGPDI 4: 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); #if 0 - print_debug("\r\n*** WATCHDOG TIMER REGISTERS ***\r\n"); + print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\r\n*** FAN CONTROL REGISTERS ***\r\n"); + print_debug("\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\r\n*** RTC REGISTERS ***\r\n"); + print_debug("\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -104,7 +104,7 @@ static void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\r\n*** HEALTH MONITORING & CONTROL REGISTERS ***\r\n"); + print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -135,7 +135,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); } } @@ -143,7 +143,7 @@ static void dump_pci_device(unsigned dev) { int i; print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i <= 255; i++) { unsigned char val; @@ -155,7 +155,7 @@ static void dump_pci_device(unsigned dev) print_debug_char(' '); print_debug_hex8(val); if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } } } @@ -165,7 +165,7 @@ static void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\r\n"); + print_debug("BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { @@ -178,14 +178,14 @@ static void dump_bar14(unsigned dev) val = pci_read_config8(dev, i); #endif if((i%4)==0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex16(i); print_debug_char(' '); } print_debug_hex32(read32(bar + i)); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } static void dump_pci_devices(void) @@ -209,7 +209,7 @@ static void dump_pci_devices(void) 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]; @@ -223,20 +223,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { @@ -249,20 +249,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } } } @@ -275,14 +275,14 @@ void dump_spd_registers(void) while(device <= SMBUS_MEM_DEVICE_END) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("dimm "); print_debug_hex8(device); for(i = 0; (i < 256) ; i++) { unsigned char byte; if ((i % 16) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(i); print_debug(": "); } @@ -290,7 +290,7 @@ void dump_spd_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); @@ -308,7 +308,7 @@ void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("ipmi "); print_debug_hex8(device); @@ -318,7 +318,7 @@ void dump_ipmi_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); diff --git a/src/mainboard/supermicro/x6dhe_g/watchdog.c b/src/mainboard/supermicro/x6dhe_g/watchdog.c index 3904a7dc94..17ec9621ad 100644 --- a/src/mainboard/supermicro/x6dhe_g/watchdog.c +++ b/src/mainboard/supermicro/x6dhe_g/watchdog.c @@ -94,6 +94,6 @@ static void disable_watchdogs(void) // disable_sio_watchdog(NSC_WD_DEV); disable_esb6300_watchdog(); // disable_jarell_frb3(); - print_debug("Watchdogs disabled\r\n"); + print_debug("Watchdogs disabled\n"); } diff --git a/src/mainboard/supermicro/x6dhe_g2/debug.c b/src/mainboard/supermicro/x6dhe_g2/debug.c index 5546421156..b4f2a185b3 100644 --- a/src/mainboard/supermicro/x6dhe_g2/debug.c +++ b/src/mainboard/supermicro/x6dhe_g2/debug.c @@ -12,7 +12,7 @@ static void print_reg(unsigned char index) print_debug_hex8(index); print_debug(": 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); return; } @@ -49,52 +49,52 @@ static void siodump(void) int i; unsigned char data; - print_debug("\r\n*** SERVER I/O REGISTERS ***\r\n"); + print_debug("\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\r\n*** XBUS REGISTERS ***\r\n"); + print_debug("\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** SERIAL 1 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\r\n*** SERIAL 2 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\r\n*** GPIO REGISTERS ***\r\n"); + print_debug("\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** GPIO VALUES ***\r\n"); + print_debug("\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\r\nGPDO 4: 0x"); + print_debug("\nGPDO 4: 0x"); print_debug_hex8(data); data = inb(0x68b); - print_debug("\r\nGPDI 4: 0x"); + print_debug("\nGPDI 4: 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); #if 0 - print_debug("\r\n*** WATCHDOG TIMER REGISTERS ***\r\n"); + print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\r\n*** FAN CONTROL REGISTERS ***\r\n"); + print_debug("\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\r\n*** RTC REGISTERS ***\r\n"); + print_debug("\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -104,7 +104,7 @@ static void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\r\n*** HEALTH MONITORING & CONTROL REGISTERS ***\r\n"); + print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -135,7 +135,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); } } @@ -143,7 +143,7 @@ static void dump_pci_device(unsigned dev) { int i; print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i <= 255; i++) { unsigned char val; @@ -155,7 +155,7 @@ static void dump_pci_device(unsigned dev) print_debug_char(' '); print_debug_hex8(val); if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } } } @@ -165,7 +165,7 @@ static void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\r\n"); + print_debug("BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { @@ -178,14 +178,14 @@ static void dump_bar14(unsigned dev) val = pci_read_config8(dev, i); #endif if((i%4)==0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex16(i); print_debug_char(' '); } print_debug_hex32(read32(bar + i)); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } static void dump_pci_devices(void) @@ -209,7 +209,7 @@ static void dump_pci_devices(void) 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]; @@ -223,20 +223,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { @@ -249,20 +249,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } } } @@ -275,14 +275,14 @@ void dump_spd_registers(void) while(device <= SMBUS_MEM_DEVICE_END) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("dimm "); print_debug_hex8(device); for(i = 0; (i < 256) ; i++) { unsigned char byte; if ((i % 16) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(i); print_debug(": "); } @@ -290,7 +290,7 @@ void dump_spd_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); @@ -308,7 +308,7 @@ void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("ipmi "); print_debug_hex8(device); @@ -318,7 +318,7 @@ void dump_ipmi_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); diff --git a/src/mainboard/supermicro/x6dhe_g2/watchdog.c b/src/mainboard/supermicro/x6dhe_g2/watchdog.c index 3904a7dc94..17ec9621ad 100644 --- a/src/mainboard/supermicro/x6dhe_g2/watchdog.c +++ b/src/mainboard/supermicro/x6dhe_g2/watchdog.c @@ -94,6 +94,6 @@ static void disable_watchdogs(void) // disable_sio_watchdog(NSC_WD_DEV); disable_esb6300_watchdog(); // disable_jarell_frb3(); - print_debug("Watchdogs disabled\r\n"); + print_debug("Watchdogs disabled\n"); } diff --git a/src/mainboard/supermicro/x6dhr_ig/debug.c b/src/mainboard/supermicro/x6dhr_ig/debug.c index 5546421156..b4f2a185b3 100644 --- a/src/mainboard/supermicro/x6dhr_ig/debug.c +++ b/src/mainboard/supermicro/x6dhr_ig/debug.c @@ -12,7 +12,7 @@ static void print_reg(unsigned char index) print_debug_hex8(index); print_debug(": 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); return; } @@ -49,52 +49,52 @@ static void siodump(void) int i; unsigned char data; - print_debug("\r\n*** SERVER I/O REGISTERS ***\r\n"); + print_debug("\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\r\n*** XBUS REGISTERS ***\r\n"); + print_debug("\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** SERIAL 1 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\r\n*** SERIAL 2 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\r\n*** GPIO REGISTERS ***\r\n"); + print_debug("\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** GPIO VALUES ***\r\n"); + print_debug("\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\r\nGPDO 4: 0x"); + print_debug("\nGPDO 4: 0x"); print_debug_hex8(data); data = inb(0x68b); - print_debug("\r\nGPDI 4: 0x"); + print_debug("\nGPDI 4: 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); #if 0 - print_debug("\r\n*** WATCHDOG TIMER REGISTERS ***\r\n"); + print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\r\n*** FAN CONTROL REGISTERS ***\r\n"); + print_debug("\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\r\n*** RTC REGISTERS ***\r\n"); + print_debug("\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -104,7 +104,7 @@ static void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\r\n*** HEALTH MONITORING & CONTROL REGISTERS ***\r\n"); + print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -135,7 +135,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); } } @@ -143,7 +143,7 @@ static void dump_pci_device(unsigned dev) { int i; print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i <= 255; i++) { unsigned char val; @@ -155,7 +155,7 @@ static void dump_pci_device(unsigned dev) print_debug_char(' '); print_debug_hex8(val); if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } } } @@ -165,7 +165,7 @@ static void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\r\n"); + print_debug("BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { @@ -178,14 +178,14 @@ static void dump_bar14(unsigned dev) val = pci_read_config8(dev, i); #endif if((i%4)==0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex16(i); print_debug_char(' '); } print_debug_hex32(read32(bar + i)); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } static void dump_pci_devices(void) @@ -209,7 +209,7 @@ static void dump_pci_devices(void) 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]; @@ -223,20 +223,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { @@ -249,20 +249,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } } } @@ -275,14 +275,14 @@ void dump_spd_registers(void) while(device <= SMBUS_MEM_DEVICE_END) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("dimm "); print_debug_hex8(device); for(i = 0; (i < 256) ; i++) { unsigned char byte; if ((i % 16) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(i); print_debug(": "); } @@ -290,7 +290,7 @@ void dump_spd_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); @@ -308,7 +308,7 @@ void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("ipmi "); print_debug_hex8(device); @@ -318,7 +318,7 @@ void dump_ipmi_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); diff --git a/src/mainboard/supermicro/x6dhr_ig/watchdog.c b/src/mainboard/supermicro/x6dhr_ig/watchdog.c index e9012a49f3..a4c1eec04f 100644 --- a/src/mainboard/supermicro/x6dhr_ig/watchdog.c +++ b/src/mainboard/supermicro/x6dhr_ig/watchdog.c @@ -94,6 +94,6 @@ static void disable_watchdogs(void) // disable_sio_watchdog(NSC_WD_DEV); disable_ich5_watchdog(); // disable_jarell_frb3(); - print_debug("Watchdogs disabled\r\n"); + print_debug("Watchdogs disabled\n"); } diff --git a/src/mainboard/supermicro/x6dhr_ig2/debug.c b/src/mainboard/supermicro/x6dhr_ig2/debug.c index 5546421156..b4f2a185b3 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/debug.c +++ b/src/mainboard/supermicro/x6dhr_ig2/debug.c @@ -12,7 +12,7 @@ static void print_reg(unsigned char index) print_debug_hex8(index); print_debug(": 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); return; } @@ -49,52 +49,52 @@ static void siodump(void) int i; unsigned char data; - print_debug("\r\n*** SERVER I/O REGISTERS ***\r\n"); + print_debug("\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\r\n*** XBUS REGISTERS ***\r\n"); + print_debug("\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** SERIAL 1 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\r\n*** SERIAL 2 CONFIG REGISTERS ***\r\n"); + print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\r\n*** GPIO REGISTERS ***\r\n"); + print_debug("\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\r\n*** GPIO VALUES ***\r\n"); + print_debug("\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\r\nGPDO 4: 0x"); + print_debug("\nGPDO 4: 0x"); print_debug_hex8(data); data = inb(0x68b); - print_debug("\r\nGPDI 4: 0x"); + print_debug("\nGPDI 4: 0x"); print_debug_hex8(data); - print_debug("\r\n"); + print_debug("\n"); #if 0 - print_debug("\r\n*** WATCHDOG TIMER REGISTERS ***\r\n"); + print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\r\n*** FAN CONTROL REGISTERS ***\r\n"); + print_debug("\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\r\n*** RTC REGISTERS ***\r\n"); + print_debug("\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -104,7 +104,7 @@ static void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\r\n*** HEALTH MONITORING & CONTROL REGISTERS ***\r\n"); + print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -135,7 +135,7 @@ static void print_pci_devices(void) continue; } print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); } } @@ -143,7 +143,7 @@ static void dump_pci_device(unsigned dev) { int i; print_debug_pci_dev(dev); - print_debug("\r\n"); + print_debug("\n"); for(i = 0; i <= 255; i++) { unsigned char val; @@ -155,7 +155,7 @@ static void dump_pci_device(unsigned dev) print_debug_char(' '); print_debug_hex8(val); if ((i & 0x0f) == 0x0f) { - print_debug("\r\n"); + print_debug("\n"); } } } @@ -165,7 +165,7 @@ static void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\r\n"); + print_debug("BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { @@ -178,14 +178,14 @@ static void dump_bar14(unsigned dev) val = pci_read_config8(dev, i); #endif if((i%4)==0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex16(i); print_debug_char(' '); } print_debug_hex32(read32(bar + i)); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } static void dump_pci_devices(void) @@ -209,7 +209,7 @@ static void dump_pci_devices(void) 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]; @@ -223,20 +223,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } device = ctrl->channel1[i]; if (device) { @@ -249,20 +249,20 @@ static void dump_spd_registers(const struct mem_controller *ctrl) int status; unsigned char byte; if ((j & 0xf) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(j); print_debug(": "); } status = smbus_read_byte(device, j); if (status < 0) { - print_debug("bad device\r\n"); + print_debug("bad device\n"); break; } byte = status & 0xff; print_debug_hex8(byte); print_debug_char(' '); } - print_debug("\r\n"); + print_debug("\n"); } } } @@ -275,14 +275,14 @@ void dump_spd_registers(void) while(device <= SMBUS_MEM_DEVICE_END) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("dimm "); print_debug_hex8(device); for(i = 0; (i < 256) ; i++) { unsigned char byte; if ((i % 16) == 0) { - print_debug("\r\n"); + print_debug("\n"); print_debug_hex8(i); print_debug(": "); } @@ -290,7 +290,7 @@ void dump_spd_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); @@ -308,7 +308,7 @@ void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\r\n"); + print_debug("\n"); print_debug("ipmi "); print_debug_hex8(device); @@ -318,7 +318,7 @@ void dump_ipmi_registers(void) if (status < 0) { print_debug("bad device: "); print_debug_hex8(-status); - print_debug("\r\n"); + print_debug("\n"); break; } print_debug_hex8(status); diff --git a/src/mainboard/supermicro/x6dhr_ig2/watchdog.c b/src/mainboard/supermicro/x6dhr_ig2/watchdog.c index e9012a49f3..a4c1eec04f 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/watchdog.c +++ b/src/mainboard/supermicro/x6dhr_ig2/watchdog.c @@ -94,6 +94,6 @@ static void disable_watchdogs(void) // disable_sio_watchdog(NSC_WD_DEV); disable_ich5_watchdog(); // disable_jarell_frb3(); - print_debug("Watchdogs disabled\r\n"); + print_debug("Watchdogs disabled\n"); } -- cgit v1.2.3