diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2010-08-03 15:42:29 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-08-03 15:42:29 +0000 |
commit | 8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e (patch) | |
tree | 8389a39faee37e90aa602aac197e44566f33f562 /src/lib | |
parent | 0362c6d6a7da2fb1ce23da544587bb1aa406e67e (diff) | |
download | coreboot-8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e.tar.xz |
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
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/generic_sdram.c | 2 | ||||
-rw-r--r-- | src/lib/ramtest.c | 24 | ||||
-rw-r--r-- | src/lib/usbdebug.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c index 8a06252170..be3499fd02 100644 --- a/src/lib/generic_sdram.c +++ b/src/lib/generic_sdram.c @@ -6,7 +6,7 @@ static inline void print_debug_sdram_8(const char *strval, uint32_t val) { -#if CONFIG_USE_PRINTK_IN_CAR +#if CONFIG_USE_DCACHE_RAM printk(BIOS_DEBUG, "%s%02x\n", strval, val); #else print_debug(strval); print_debug_hex8(val); print_debug("\n"); diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c index 98872a47d7..a7944e4ea3 100644 --- a/src/lib/ramtest.c +++ b/src/lib/ramtest.c @@ -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"); diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index d5372d9e2c..801cfdbcaf 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -22,7 +22,7 @@ #if !defined(__ROMCC__) #include <console/console.h> #else -#if CONFIG_USE_PRINTK_IN_CAR==0 +#if CONFIG_USE_DCACHE_RAM==0 #define printk(BIOS_DEBUG, fmt, arg...) do {} while(0) #endif #endif |