Drop the USE_PRINTK_IN_CAR option. It's a bogus decision to make for any user /
board porter: printk should always be available in CAR mode. Also drop CONFIG_USE_INIT, it's only been selected on one ASROCK board but it's not been used there. Very odd. There is one usage of CONFIG_USE_INIT which was always off in src/cpu/intel/car/cache_as_ram.inc and we have to figure out what to do with those few lines. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5682 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Stefan Reinauer
parent
0362c6d6a7
commit
8c4f31b3b5
@@ -51,7 +51,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
|
||||
/*
|
||||
* Fill.
|
||||
*/
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop);
|
||||
#else
|
||||
print_debug("DRAM fill: ");
|
||||
@@ -63,7 +63,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
|
||||
for(addr = start; addr < stop ; addr += 4) {
|
||||
/* Display address being filled */
|
||||
if (!(addr & 0xfffff)) {
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "%08lx \r", addr);
|
||||
#else
|
||||
print_debug_hex32(addr);
|
||||
@@ -73,7 +73,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
|
||||
write_phys(addr, (u32)addr);
|
||||
};
|
||||
/* Display final address */
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
|
||||
#else
|
||||
print_debug_hex32(addr);
|
||||
@@ -88,7 +88,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
/*
|
||||
* Verify.
|
||||
*/
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop);
|
||||
#else
|
||||
print_debug("DRAM verify: ");
|
||||
@@ -101,7 +101,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
unsigned long value;
|
||||
/* Display address being tested */
|
||||
if (!(addr & 0xfffff)) {
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "%08lx \r", addr);
|
||||
#else
|
||||
print_debug_hex32(addr);
|
||||
@@ -111,7 +111,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
value = read_phys(addr);
|
||||
if (value != addr) {
|
||||
/* Display address with error */
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value);
|
||||
#else
|
||||
print_err("Fail: @0x");
|
||||
@@ -122,7 +122,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
#endif
|
||||
i++;
|
||||
if(i>256) {
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "Aborting.\n");
|
||||
#else
|
||||
print_debug("Aborting.\n");
|
||||
@@ -132,14 +132,14 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
}
|
||||
}
|
||||
/* Display final address */
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "%08lx", addr);
|
||||
#else
|
||||
print_debug_hex32(addr);
|
||||
#endif
|
||||
|
||||
if (i) {
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n");
|
||||
#else
|
||||
print_debug("\nDRAM did _NOT_ verify!\n");
|
||||
@@ -147,7 +147,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
|
||||
die("DRAM ERROR");
|
||||
}
|
||||
else {
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "\nDRAM range verified.\n");
|
||||
#else
|
||||
print_debug("\nDRAM range verified.\n");
|
||||
@@ -163,7 +163,7 @@ void ram_check(unsigned long start, unsigned long stop)
|
||||
* test than a "Is my DRAM faulty?" test. Not all bits
|
||||
* are tested. -Tyson
|
||||
*/
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop);
|
||||
#else
|
||||
print_debug("Testing DRAM : ");
|
||||
@@ -176,7 +176,7 @@ void ram_check(unsigned long start, unsigned long stop)
|
||||
/* Make sure we don't read before we wrote */
|
||||
phys_memory_barrier();
|
||||
ram_verify(start, stop);
|
||||
#if CONFIG_USE_PRINTK_IN_CAR
|
||||
#if CONFIG_USE_DCACHE_RAM
|
||||
printk(BIOS_DEBUG, "Done.\n");
|
||||
#else
|
||||
print_debug("Done.\n");
|
||||
|
Reference in New Issue
Block a user