From a56edacbe3d142882c1be88d998a73f6f0eaf1ec Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 2 Aug 2008 15:09:12 +0000 Subject: [PATCH] This patch * fixes a warning * puts some debug messages to spew because they're only useful to debug CAR * print an explicit message "Uncompressing..." instad of "Copying..." when coreboot_ram.rom is compressed. Signed-off-by: Stefan Reinauer Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3463 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/car/copy_and_run.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c index a7ccf9c173..d237f20eea 100644 --- a/src/cpu/x86/car/copy_and_run.c +++ b/src/cpu/x86/car/copy_and_run.c @@ -12,12 +12,14 @@ static void copy_and_run(unsigned cpu_reset) { uint8_t *src, *dst; +#if !CONFIG_COMPRESS unsigned long dst_len; +#endif unsigned long ilen, olen; - print_debug("Copying coreboot to RAM.\r\n"); #if !CONFIG_COMPRESS + print_debug("Copying coreboot to RAM.\r\n"); __asm__ volatile ( "leal _liseg, %0\n\t" "leal _iseg, %1\n\t" @@ -27,6 +29,7 @@ static void copy_and_run(unsigned cpu_reset) ); memcpy(src, dst, dst_len); #else + print_debug("Uncompressing coreboot to RAM.\r\n"); __asm__ volatile ( "leal _liseg, %0\n\t" @@ -35,11 +38,11 @@ static void copy_and_run(unsigned cpu_reset) ); #if CONFIG_USE_INIT - printk_debug("src=%08x\r\n",src); - printk_debug("dst=%08x\r\n",dst); + printk_spew("src=%08x\r\n",src); + printk_spew("dst=%08x\r\n",dst); #else - print_debug("src="); print_debug_hex32(src); print_debug("\r\n"); - print_debug("dst="); print_debug_hex32(dst); print_debug("\r\n"); + print_spew("src="); print_spew_hex32((uint32_t)src); print_spew("\r\n"); + print_spew("dst="); print_spew_hex32((uint32_t)dst); print_spew("\r\n"); #endif // dump_mem(src, src+0x100); @@ -49,9 +52,9 @@ static void copy_and_run(unsigned cpu_reset) #endif // dump_mem(dst, dst+0x100); #if CONFIG_USE_INIT - printk_debug("linxbios_ram.bin length = %08x\r\n", olen); + printk_spew("linxbios_ram.bin length = %08x\r\n", olen); #else - print_debug("linxbios_ram.bin length = "); print_debug_hex32(olen); print_debug("\r\n"); + print_spew("linxbios_ram.bin length = "); print_spew_hex32(olen); print_spew("\r\n"); #endif print_debug("Jumping to coreboot.\r\n");