From 6908d9ce4c26a8bc00e3616bc0764bbb292d6bfd Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 24 Jan 2010 21:18:00 +0000 Subject: [PATCH] Sparc64: fix initrd Fix HdrS offsets for Sparc64. The initrd address must be offset by KERNBASE. Use rom_ptr mechanism to actually write to the kernel image. Signed-off-by: Blue Swirl --- hw/sun4u.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index a39b28e4ba..c1530a653b 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -169,6 +169,7 @@ static unsigned long sun4u_load_kernel(const char *kernel_filename, int linux_boot; unsigned int i; long kernel_size; + uint8_t *ptr; linux_boot = (kernel_filename != NULL); @@ -211,9 +212,10 @@ static unsigned long sun4u_load_kernel(const char *kernel_filename, } if (*initrd_size > 0) { for (i = 0; i < 64 * TARGET_PAGE_SIZE; i += TARGET_PAGE_SIZE) { - if (ldl_phys(KERNEL_LOAD_ADDR + i) == 0x48647253) { // HdrS - stl_phys(KERNEL_LOAD_ADDR + i + 16, INITRD_LOAD_ADDR); - stl_phys(KERNEL_LOAD_ADDR + i + 20, *initrd_size); + ptr = rom_ptr(KERNEL_LOAD_ADDR + i); + if (ldl_p(ptr + 8) == 0x48647253) { /* HdrS */ + stl_p(ptr + 24, INITRD_LOAD_ADDR + KERNEL_LOAD_ADDR - 0x4000); + stl_p(ptr + 28, *initrd_size); break; } } -- 2.11.4.GIT