fix the tree

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2296 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 7 insertions, 9 deletions

diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c
index b81297c149..76b8a8b847 100644
--- a/src/cpu/amd/car/copy_and_run.c
+++ b/src/cpu/amd/car/copy_and_run.c
@@ -38,17 +38,15 @@ static void copy_and_run(void)
 #else 
 
         __asm__ volatile (
-	        "leal  _liseg, %0\n\t"
-	        "leal  _iseg,  %1\n\t"
+	        "leal _liseg, %0\n\t"
+	        "leal _iseg,  %1\n\t"
                 : "=a" (src) , "=b" (dst)
         );
 
 	print_debug_cp_run("src=",(uint32_t)src); 
 	print_debug_cp_run("dst=",(uint32_t)dst);
 
-	olen = unrv2b(src, dst, &ilen);
-	print_debug_cp_run("linxbios_ram.nrv2b length = ", ilen);
-
+	olen = unrv2b(src, dst);
 #endif
 
 	print_debug_cp_run("linxbios_ram.bin   length = ", olen);
diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c
index 98a47c9bc6..5c61177a10 100644
--- a/src/cpu/x86/car/copy_and_run.c
+++ b/src/cpu/x86/car/copy_and_run.c
@@ -4,6 +4,8 @@
 */
 
 #if CONFIG_COMPRESS
+#define ENDIAN   0
+#define BITSIZE 32
 #include "lib/nrv2b.c"
 #endif
 
@@ -11,9 +13,7 @@ static void copy_and_run(unsigned cpu_reset)
 {
 	uint8_t *src, *dst; 
 	unsigned long dst_len;
-        unsigned long ilen = 0, olen = 0, last_m_off =  1;
-        uint32_t bb = 0;
-        unsigned bc = 0;
+        unsigned long ilen, olen;
 
 	print_debug("Copying LinuxBIOS to ram.\r\n");
 
@@ -44,7 +44,7 @@ static void copy_and_run(unsigned cpu_reset)
 	
 //	dump_mem(src, src+0x100);
 
-	unrv2b(src, dst);
+	olen=unrv2b(src, dst);
 
 #endif
 //	dump_mem(dst, dst+0x100);