diff options
| author | Yinghai Lu <yinghailu@gmail.com> | 2006-05-04 00:47:15 +0000 |
|---|---|---|
| committer | Yinghai Lu <yinghailu@gmail.com> | 2006-05-04 00:47:15 +0000 |
| commit | 608d4b2c444515784a0ee54e018bb8a68456eb4a (patch) | |
| tree | 47ca84cad4dbc1f6a5d266e9eaf4ecff3da5b58f /src/cpu/amd | |
| parent | 4c475321341e16250cdc7b6eb1183e1a3cf62c74 (diff) | |
merge zrom to rom_stream and print olen ilen
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2292 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd')
| -rw-r--r-- | src/cpu/amd/car/cache_as_ram_post.c | 0 | ||||
| -rw-r--r-- | src/cpu/amd/car/copy_and_run.c | 25 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/cpu/amd/car/cache_as_ram_post.c b/src/cpu/amd/car/cache_as_ram_post.c deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/cpu/amd/car/cache_as_ram_post.c +++ /dev/null diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c index 341c66e910..b81297c149 100644 --- a/src/cpu/amd/car/copy_and_run.c +++ b/src/cpu/amd/car/copy_and_run.c @@ -3,10 +3,6 @@ 2006/05/02 - stepan: move nrv2b to an extra file. */ -#if CONFIG_COMPRESS -#include "lib/nrv2b.c" -#endif - static inline void print_debug_cp_run(const char *strval, uint32_t val) { #if CONFIG_USE_INIT @@ -16,12 +12,17 @@ static inline void print_debug_cp_run(const char *strval, uint32_t val) #endif } +#if CONFIG_COMPRESS +#define ENDIAN 0 +#define BITSIZE 32 +#include "lib/nrv2b.c" +#endif + + static void copy_and_run(void) { uint8_t *src, *dst; - 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"); @@ -37,18 +38,20 @@ 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); - unrv2b(src, dst); + olen = unrv2b(src, dst, &ilen); + print_debug_cp_run("linxbios_ram.nrv2b length = ", ilen); + #endif - print_debug_cp_run("linxbios_ram.bin length = ", olen); + print_debug_cp_run("linxbios_ram.bin length = ", olen); print_debug("Jumping to LinuxBIOS.\r\n"); |