From 3cfbc4a60873691d7ee21dda388c268b811782dd Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Wed, 13 Apr 2016 02:47:24 +0200 Subject: romcc: Use UNIX line endings in linux tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it easier to check the output against a reference output. Change-Id: I9c7ae538b708399a5cadd18e498618d7480d240f Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/14276 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- util/romcc/tests/linux_test1.c | 2 +- util/romcc/tests/linux_test2.c | 8 ++++---- util/romcc/tests/linux_test5.c | 13 ++++++------- util/romcc/tests/linux_test6.c | 8 ++++---- util/romcc/tests/linux_test8.c | 6 +++--- 5 files changed, 18 insertions(+), 19 deletions(-) (limited to 'util') diff --git a/util/romcc/tests/linux_test1.c b/util/romcc/tests/linux_test1.c index ee82148031..cb435e2a99 100644 --- a/util/romcc/tests/linux_test1.c +++ b/util/romcc/tests/linux_test1.c @@ -2,7 +2,7 @@ static void main(void) { - static const char msg[] = "hello world\r\n"; + static const char msg[] = "hello world\n"; write(STDOUT_FILENO, msg, sizeof(msg)); _exit(0); } diff --git a/util/romcc/tests/linux_test2.c b/util/romcc/tests/linux_test2.c index 766f498a0a..577e0c3c2a 100644 --- a/util/romcc/tests/linux_test2.c +++ b/util/romcc/tests/linux_test2.c @@ -640,7 +640,7 @@ static void setup_coherent_ht_domain(void) }; int i; int max; - print_debug("setting up coherent ht domain....\r\n"); + print_debug("setting up coherent ht domain....\n"); max = sizeof(register_values)/sizeof(register_values[0]); for(i = 0; i < max; i += 3) { unsigned long reg; @@ -648,7 +648,7 @@ static void setup_coherent_ht_domain(void) print_debug_hex32(register_values[i]); print_debug(" <-"); print_debug_hex32(register_values[i+2]); - print_debug("\r\n"); + print_debug("\n"); #endif #if 0 reg = pci_read_config32(register_values[i]); @@ -657,12 +657,12 @@ static void setup_coherent_ht_domain(void) pci_write_config32(register_values[i], reg); #endif } - print_debug("done.\r\n"); + print_debug("done.\n"); } static void main(void) { - static const char msg[] = "hello world\r\n"; + static const char msg[] = "hello world\n"; #if 0 write(STDOUT_FILENO, msg, sizeof(msg)); #endif diff --git a/util/romcc/tests/linux_test5.c b/util/romcc/tests/linux_test5.c index 473f57289d..cf0df46d54 100644 --- a/util/romcc/tests/linux_test5.c +++ b/util/romcc/tests/linux_test5.c @@ -93,7 +93,7 @@ static void disable_dimm(unsigned index) { print_debug("disabling dimm"); print_debug_hex8(index); - print_debug("\r\n"); + print_debug("\n"); #if 0 pci_write_config32(PCI_DEV(0, 0x18, 2), DRAM_CSBASE + (((index << 1)+0)<<2), 0); pci_write_config32(PCI_DEV(0, 0x18, 2), DRAM_CSBASE + (((index << 1)+1)<<2), 0); @@ -145,7 +145,6 @@ static const struct mem_param *get_mem_param(unsigned min_cycle_time) static void debug(int c) { print_debug_char(c); - print_debug_char('\r'); print_debug_char('\n'); } #endif @@ -179,7 +178,7 @@ static const struct mem_param *spd_set_memclk(void) print_debug_hex8(min_cycle_time); print_debug(" min_latency: "); print_debug_hex8(min_latency); - print_debug("\r\n"); + print_debug("\n"); #endif /* Compute the least latency with the fastest clock supported @@ -240,7 +239,7 @@ static const struct mem_param *spd_set_memclk(void) print_debug_hex8(new_cycle_time); print_debug(" new_latency: "); print_debug_hex8(new_latency); - print_debug("\r\n"); + print_debug("\n"); #endif } debug('G'); @@ -253,7 +252,7 @@ static const struct mem_param *spd_set_memclk(void) print_debug_hex8(new_cycle_time); print_debug(" new_latency: "); print_debug_hex8(new_latency); - print_debug("\r\n"); + print_debug("\n"); #endif if (new_latency > 4){ continue; @@ -274,7 +273,7 @@ static const struct mem_param *spd_set_memclk(void) print_debug_hex8(min_cycle_time); print_debug(" min_latency: "); print_debug_hex8(min_latency); - print_debug("\r\n"); + print_debug("\n"); #endif } /* Make a second pass through the dimms and disable @@ -328,7 +327,7 @@ static const struct mem_param *spd_set_memclk(void) print_debug_hex8(min_cycle_time); print_debug(" min_latency: "); print_debug_hex8(min_latency); - print_debug("\r\n"); + print_debug("\n"); #endif /* Now that I know the minimum cycle time lookup the memory parameters */ param = get_mem_param(min_cycle_time); diff --git a/util/romcc/tests/linux_test6.c b/util/romcc/tests/linux_test6.c index f93ab9273d..2ae6cd1c9a 100644 --- a/util/romcc/tests/linux_test6.c +++ b/util/romcc/tests/linux_test6.c @@ -6,11 +6,11 @@ static void main(void) static const int value[] = { 1, 0 }; const char *str; if (value[1]) { - print_debug("A\r\n"); - str = "Unbuffered\r\n"; + print_debug("A\n"); + str = "Unbuffered\n"; } else { - print_debug("B\r\n"); - str = "Registered\r\n"; + print_debug("B\n"); + str = "Registered\n"; } print_debug(str); _exit(0); diff --git a/util/romcc/tests/linux_test8.c b/util/romcc/tests/linux_test8.c index adee3c108d..dfd377635d 100644 --- a/util/romcc/tests/linux_test8.c +++ b/util/romcc/tests/linux_test8.c @@ -9,13 +9,13 @@ struct mem_param { unsigned dch_memclk; unsigned short dch_tref4k, dch_tref8k; unsigned char dtl_twr; - char name[9]; + char name[8]; }; static void test(void) { static const struct mem_param param0 = { - .name = "166Mhz\r\n", + .name = "166Mhz\n", .cycle_time = 0x60, .divisor = (6<<1), .tRC = 0x3C, @@ -34,6 +34,6 @@ static void test(void) clocks = (value + (param->divisor << 1) - 1)/(param->divisor << 1); print_debug("clocks: "); print_debug_hex32(clocks); - print_debug("\r\n"); + print_debug("\n"); _exit(0); } -- cgit v1.2.3