sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear improper use of CONFIG_CACHE_AS_RAM

Browse Source 
Choice between printk/print_ is related to CAR, but really
depends whether we compiled with GCC or ROMCC.

Change-Id: I9fe831a215736462e8b3f4b96ffe231133ecf79b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/347
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2011-10-28 16:15:47 +03:00 committed by Stefan Reinauer
parent d3edd9abe9
commit 481814d1ab
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/ramtest.c
View File

@ -53,7 +53,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
/* /*
* Fill. * Fill.
*/ */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop); printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop);
#else #else
print_debug("DRAM fill: "); print_debug("DRAM fill: ");
@ -65,7 +65,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
for(addr = start; addr < stop ; addr += 4) { for(addr = start; addr < stop ; addr += 4) {
/* Display address being filled */ /* Display address being filled */
if (!(addr & 0xfffff)) { if (!(addr & 0xfffff)) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%08lx \r", addr); printk(BIOS_DEBUG, "%08lx \r", addr);
#else #else
print_debug_hex32(addr); print_debug_hex32(addr);
@ -75,7 +75,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
write_phys(addr, (u32)addr); write_phys(addr, (u32)addr);
}; };
/* Display final address */ /* Display final address */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr); printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
#else #else
print_debug_hex32(addr); print_debug_hex32(addr);
@ -90,7 +90,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
/* /*
* Verify. * Verify.
*/ */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop); printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop);
#else #else
print_debug("DRAM verify: "); print_debug("DRAM verify: ");
@ -103,7 +103,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
unsigned long value; unsigned long value;
/* Display address being tested */ /* Display address being tested */
if (!(addr & 0xfffff)) { if (!(addr & 0xfffff)) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%08lx \r", addr); printk(BIOS_DEBUG, "%08lx \r", addr);
#else #else
print_debug_hex32(addr); print_debug_hex32(addr);
@ -113,7 +113,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
value = read_phys(addr); value = read_phys(addr);
if (value != addr) { if (value != addr) {
/* Display address with error */ /* Display address with error */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value); printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value);
#else #else
print_err("Fail: @0x"); print_err("Fail: @0x");
@ -124,7 +124,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
#endif #endif
i++; i++;
if(i>256) { if(i>256) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "Aborting.\n"); printk(BIOS_DEBUG, "Aborting.\n");
#else #else
print_debug("Aborting.\n"); print_debug("Aborting.\n");
@ -134,14 +134,14 @@ static void ram_verify(unsigned long start, unsigned long stop)
} }
} }
/* Display final address */ /* Display final address */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%08lx", addr); printk(BIOS_DEBUG, "%08lx", addr);
#else #else
print_debug_hex32(addr); print_debug_hex32(addr);
#endif #endif
if (i) { if (i) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n"); printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n");
#else #else
print_debug("\nDRAM did _NOT_ verify!\n"); print_debug("\nDRAM did _NOT_ verify!\n");
@ -149,7 +149,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
die("DRAM ERROR"); die("DRAM ERROR");
} }
else { else {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\nDRAM range verified.\n"); printk(BIOS_DEBUG, "\nDRAM range verified.\n");
#else #else
print_debug("\nDRAM range verified.\n"); print_debug("\nDRAM range verified.\n");
@ -165,7 +165,7 @@ void ram_check(unsigned long start, unsigned long stop)
* test than a "Is my DRAM faulty?" test. Not all bits * test than a "Is my DRAM faulty?" test. Not all bits
* are tested. -Tyson * are tested. -Tyson
*/ */
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop); printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop);
#else #else
print_debug("Testing DRAM : "); print_debug("Testing DRAM : ");
@ -178,7 +178,7 @@ void ram_check(unsigned long start, unsigned long stop)
/* Make sure we don't read before we wrote */ /* Make sure we don't read before we wrote */
phys_memory_barrier(); phys_memory_barrier();
ram_verify(start, stop); ram_verify(start, stop);
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "Done.\n"); printk(BIOS_DEBUG, "Done.\n");
#else #else
print_debug("Done.\n"); print_debug("Done.\n");

32
src/northbridge/intel/e7501/debug.c
View File

@ -39,7 +39,7 @@ static void dump_pci_device(unsigned dev)
for(i = 0; i < 256; i++) { for(i = 0; i < 256; i++) {
unsigned char val; unsigned char val;
if ((i & 0x0f) == 0) { if ((i & 0x0f) == 0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\n%02x:",i); printk(BIOS_DEBUG, "\n%02x:",i);
#else #else
print_debug("\n"); print_debug("\n");
@ -48,7 +48,7 @@ static void dump_pci_device(unsigned dev)
#endif #endif
} }
val = pci_read_config8(dev, i); val = pci_read_config8(dev, i);
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, " %02x", val); printk(BIOS_DEBUG, " %02x", val);
#else #else
print_debug_char(' '); print_debug_char(' ');
@ -101,7 +101,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
device = ctrl->channel0[i]; device = ctrl->channel0[i];
if (device) { if (device) {
int j; int j;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "dimm: %02x.0: %02x", i, device); printk(BIOS_DEBUG, "dimm: %02x.0: %02x", i, device);
#else #else
print_debug("dimm: "); print_debug("dimm: ");
@ -113,7 +113,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
int status; int status;
unsigned char byte; unsigned char byte;
if ((j & 0xf) == 0) { if ((j & 0xf) == 0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\n%02x: ", j); printk(BIOS_DEBUG, "\n%02x: ", j);
#else #else
print_debug("\n"); print_debug("\n");
@ -126,7 +126,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
break; break;
} }
byte = status & 0xff; byte = status & 0xff;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%02x ", byte); printk(BIOS_DEBUG, "%02x ", byte);
#else #else
print_debug_hex8(byte); print_debug_hex8(byte);
@ -138,7 +138,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
device = ctrl->channel1[i]; device = ctrl->channel1[i];
if (device) { if (device) {
int j; int j;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "dimm: %02x.1: %02x", i, device); printk(BIOS_DEBUG, "dimm: %02x.1: %02x", i, device);
#else #else
print_debug("dimm: "); print_debug("dimm: ");
@ -150,7 +150,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
int status; int status;
unsigned char byte; unsigned char byte;
if ((j & 0xf) == 0) { if ((j & 0xf) == 0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\n%02x: ", j); printk(BIOS_DEBUG, "\n%02x: ", j);
#else #else
print_debug("\n"); print_debug("\n");
@ -163,7 +163,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
break; break;
} }
byte = status & 0xff; byte = status & 0xff;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%02x ", byte); printk(BIOS_DEBUG, "%02x ", byte);
#else #else
print_debug_hex8(byte); print_debug_hex8(byte);
@ -181,7 +181,7 @@ static inline void dump_smbus_registers(void)
for(device = 1; device < 0x80; device++) { for(device = 1; device < 0x80; device++) {
int j; int j;
if( smbus_read_byte(device, 0) < 0 ) continue; if( smbus_read_byte(device, 0) < 0 ) continue;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "smbus: %02x", device); printk(BIOS_DEBUG, "smbus: %02x", device);
#else #else
print_debug("smbus: "); print_debug("smbus: ");
@ -195,7 +195,7 @@ static inline void dump_smbus_registers(void)
break; break;
} }
if ((j & 0xf) == 0) { if ((j & 0xf) == 0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\n%02x: ",j); printk(BIOS_DEBUG, "\n%02x: ",j);
#else #else
print_debug("\n"); print_debug("\n");
@ -204,7 +204,7 @@ static inline void dump_smbus_registers(void)
#endif #endif
} }
byte = status & 0xff; byte = status & 0xff;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%02x ", byte); printk(BIOS_DEBUG, "%02x ", byte);
#else #else
print_debug_hex8(byte); print_debug_hex8(byte);
@ -219,7 +219,7 @@ static inline void dump_io_resources(unsigned port)
{ {
int i; int i;
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%04x:\n", port); printk(BIOS_DEBUG, "%04x:\n", port);
#else #else
print_debug_hex16(port); print_debug_hex16(port);
@ -228,7 +228,7 @@ static inline void dump_io_resources(unsigned port)
for(i=0;i<256;i++) { for(i=0;i<256;i++) {
uint8_t val; uint8_t val;
if ((i & 0x0f) == 0) { if ((i & 0x0f) == 0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "%02x:", i); printk(BIOS_DEBUG, "%02x:", i);
#else #else
print_debug_hex8(i); print_debug_hex8(i);
@ -236,7 +236,7 @@ static inline void dump_io_resources(unsigned port)
#endif #endif
} }
val = inb(port); val = inb(port);
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, " %02x",val); printk(BIOS_DEBUG, " %02x",val);
#else #else
print_debug_char(' '); print_debug_char(' ');
@ -255,7 +255,7 @@ static inline void dump_mem(unsigned start, unsigned end)
print_debug("dump_mem:"); print_debug("dump_mem:");
for(i=start;i<end;i++) { for(i=start;i<end;i++) {
if((i & 0xf)==0) { if((i & 0xf)==0) {
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, "\n%08x:", i); printk(BIOS_DEBUG, "\n%08x:", i);
#else #else
print_debug("\n"); print_debug("\n");
@ -263,7 +263,7 @@ static inline void dump_mem(unsigned start, unsigned end)
print_debug(":"); print_debug(":");
#endif #endif
} }
#if CONFIG_CACHE_AS_RAM #if !defined(__ROMCC__)
printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i)); printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i));
#else #else
print_debug(" "); print_debug(" ");