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 <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5342 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 28 insertions, 28 deletions

diff --git a/src/northbridge/intel/i855/debug.c b/src/northbridge/intel/i855/debug.c
index 4083add6f1..40da896589 100644
--- a/src/northbridge/intel/i855/debug.c
+++ b/src/northbridge/intel/i855/debug.c
@@ -60,7 +60,7 @@ static void print_pci_devices(void)
 			continue;
 		}
 		print_debug_pci_dev(dev);
-		print_debug("\r\n");
+		print_debug("\n");
 	}
 }
 
@@ -68,7 +68,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;
@@ -80,7 +80,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");
 		}
 	}
 }
@@ -105,7 +105,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 < 2; i++) {
 		unsigned device;
 		device = ctrl->channel0[i];
@@ -119,20 +119,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");
 		}
 #if 0
 		device = ctrl->channel1[i];
@@ -146,20 +146,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");
 		}
 #endif
 	}
@@ -167,7 +167,7 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
 static void dump_smbus_registers(void)
 {
         int i;
-        print_debug("\r\n");
+        print_debug("\n");
         for(i = 1; i < 0x80; i++) {
                 unsigned device;
                 device = i;
@@ -178,20 +178,20 @@ static void dump_smbus_registers(void)
                 	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");
 	}	
 }
 #endif
diff --git a/src/northbridge/intel/i855/raminit.c b/src/northbridge/intel/i855/raminit.c
index 8e928bd279..136266da2c 100644
--- a/src/northbridge/intel/i855/raminit.c
+++ b/src/northbridge/intel/i855/raminit.c
@@ -31,7 +31,7 @@
 static void sdram_set_registers(const struct mem_controller *ctrl)
 {
 	/*
-	print_debug("Before configuration:\r\n");
+	print_debug("Before configuration:\n");
 	dump_pci_devices();
 	*/
 }
@@ -212,7 +212,7 @@ static void ram_command_mrs(const struct mem_controller *ctrl,
 	adjusted_mode = ((mode & 0x800) << (13 - 11)) | ((mode & 0x3ff) << (12 - 9));
 	print_debug("Setting mode: ");
 	print_debug_hex32(adjusted_mode + addr);
-	print_debug("\r\n");
+	print_debug("\n");
 	read32(adjusted_mode + addr);
 }
 
@@ -229,39 +229,39 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
 {
 	int i;
 	uint32_t rank1 = (1 << 30) / 2;
-	print_debug("Ram enable 1\r\n");
+	print_debug("Ram enable 1\n");
 	delay();
 	delay();
 	
-	print_debug("Ram enable 2\r\n");
+	print_debug("Ram enable 2\n");
 	ram_command(ctrl, 1, 0);
 	ram_command(ctrl, 1, rank1);
 	delay();
 	delay();
 
-	print_debug("Ram enable 3\r\n");
+	print_debug("Ram enable 3\n");
 	ram_command(ctrl, 2, 0);
 	ram_command(ctrl, 2, rank1);
 	delay();
 	delay();
 
-	print_debug("Ram enable 4\r\n");
+	print_debug("Ram enable 4\n");
 	ram_command_mrs(ctrl, 4, SDRAM_EXTMODE_DLL_ENABLE, 0);
 	ram_command_mrs(ctrl, 4, SDRAM_EXTMODE_DLL_ENABLE, rank1);
 	delay();
 	delay();
 	
-	print_debug("Ram enable 5\r\n");
+	print_debug("Ram enable 5\n");
 	ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_DLL_RESET, 0);
 	ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_DLL_RESET, rank1);
 	
-	print_debug("Ram enable 6\r\n");
+	print_debug("Ram enable 6\n");
 	ram_command(ctrl, 2, 0);
 	ram_command(ctrl, 2, rank1);
 	delay();
 	delay();
 	
-	print_debug("Ram enable 7\r\n");
+	print_debug("Ram enable 7\n");
 	for(i = 0; i < 8; i++) {
 		ram_command(ctrl, 6, 0);
 		ram_command(ctrl, 6, rank1);
@@ -269,28 +269,28 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
 		delay();
 	}
 
-	print_debug("Ram enable 8\r\n");
+	print_debug("Ram enable 8\n");
 	ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_NORMAL, 0);
 	ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_NORMAL, rank1);
 
-	print_debug("Ram enable 9\r\n");
+	print_debug("Ram enable 9\n");
 	ram_command(ctrl, 7, 0);
 	ram_command(ctrl, 7, rank1);
 	delay();
 	delay();
 	
-	print_debug("Ram enable 9\r\n");
+	print_debug("Ram enable 9\n");
 	set_initialize_complete(ctrl);
 	
 	delay();
 	delay();
 	delay();
 	
-	print_debug("After configuration:\r\n");
+	print_debug("After configuration:\n");
 	/* dump_pci_devices(); */
 	
 	/*
-	print_debug("\n\n***** RAM TEST *****\r\n");	
+	print_debug("\n\n***** RAM TEST *****\n");	
 	ram_check(0, 0xa0000);
 	ram_check(0x100000, 0x40000000);
 	*/