summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2008-08-02 19:17:42 +0000
committerStefan Reinauer <stepan@openbios.org>2008-08-02 19:17:42 +0000
commit87c938f139b14a2e0b7fbfa6476c3caaa953e968 (patch)
treeee38c0a23ce57b13cb7ab5a9a4c64a8a8de2e9f4 /src/cpu
parent685240610b22f8e5f82204e526c6b8a8d6657173 (diff)
adapt Uncompressing.. patch for AMD code. Also replace "linxbios" by "coreboot"
in a number of places. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3466 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/car/copy_and_run.c11
-rw-r--r--src/cpu/x86/car/copy_and_run.c4
2 files changed, 8 insertions, 7 deletions
diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c
index e692853385..80fc84072b 100644
--- a/src/cpu/amd/car/copy_and_run.c
+++ b/src/cpu/amd/car/copy_and_run.c
@@ -23,9 +23,9 @@ static void copy_and_run(void)
uint8_t *src, *dst;
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"
@@ -35,6 +35,7 @@ static void copy_and_run(void)
);
memcpy(dst, src, olen);
#else
+ print_debug("Uncompressing coreboot to RAM.\r\n");
__asm__ volatile (
"leal _liseg, %0\n\t"
@@ -48,12 +49,12 @@ static void copy_and_run(void)
// dump_mem(src, src+0x100);
olen = unrv2b(src, dst, &ilen);
- print_debug_cp_run("linxbios_ram.nrv2b length = ", ilen);
+ print_debug_cp_run("coreboot_ram.nrv2b length = ", ilen);
#endif
// dump_mem(dst, dst+0x100);
- print_debug_cp_run("linxbios_ram.bin length = ", olen);
+ print_debug_cp_run("coreboot_ram.bin length = ", olen);
print_debug("Jumping to coreboot.\r\n");
@@ -98,12 +99,12 @@ static void copy_and_run_ap_code_in_car(unsigned ret_addr)
// dump_mem(src, src+0x100);
olen = unrv2b(src, dst, &ilen);
-// print_debug_cp_run("linxbios_apc.nrv2b length = ", ilen);
+// print_debug_cp_run("coreboot_apc.nrv2b length = ", ilen);
#endif
// dump_mem(dst, dst+0x100);
-// print_debug_cp_run("linxbios_apc.bin length = ", olen);
+// print_debug_cp_run("coreboot_apc.bin length = ", olen);
// print_debug("Jumping to coreboot AP code in CAR.\r\n");
diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c
index d237f20eea..ac2b7b0ca7 100644
--- a/src/cpu/x86/car/copy_and_run.c
+++ b/src/cpu/x86/car/copy_and_run.c
@@ -52,9 +52,9 @@ static void copy_and_run(unsigned cpu_reset)
#endif
// dump_mem(dst, dst+0x100);
#if CONFIG_USE_INIT
- printk_spew("linxbios_ram.bin length = %08x\r\n", olen);
+ printk_spew("coreboot_ram.bin length = %08x\r\n", olen);
#else
- print_spew("linxbios_ram.bin length = "); print_spew_hex32(olen); print_spew("\r\n");
+ print_spew("coreboot_ram.bin length = "); print_spew_hex32(olen); print_spew("\r\n");
#endif
print_debug("Jumping to coreboot.\r\n");