From 10f6389453e746a5235e5db6c70b4b55dc0355a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 18:48:33 +0100
Subject: [PATCH] Fix raw image addresses

---
 boot/sparc64/ieee1275/boot.S         | 2 +-
 boot/sparc64/ieee1275/diskboot.S     | 2 +-
 include/grub/sparc64/ieee1275/boot.h | 5 +++--
 util/grub-mkrawimage.c               | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 74f4ee014..167406017 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -118,7 +118,7 @@ prom_call:
 
 boot_continue:
 	mov	%o7, PIC_REG		/* PIC base */
-	sethi	%hi(SCRATCH_PAD), %l1	/* OF argument slots */
+	sethi	%hi(SCRATCH_PAD_BOOT), %l1	/* OF argument slots */
 
 	/* Find the /chosen node so we can fetch the stdout handle,
 	 * and thus perform console output.
diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index 5016bf9e0..a4d4b5bf9 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -81,7 +81,7 @@ prom_call:
 
 
 after_info_block:
-	sethi	%hi(SCRATCH_PAD), %l1	/* OF argument slots */
+	sethi	%hi(SCRATCH_PAD_DISKBOOT), %l1	/* OF argument slots */
 
 	GET_ABS(notification_string, %o2)
 	call	console_write
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index 95f311ce5..e1c1aa675 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -25,7 +25,8 @@
 #define BOOTDEV_REG			%l6
 #define PIC_REG				%l7
 
-#define	SCRATCH_PAD			0x10000
+#define	SCRATCH_PAD_BOOT		0x5000
+#define	SCRATCH_PAD_DISKBOOT		0x4000
 
 #define GET_ABS(symbol, reg)	\
 	add	PIC_REG, (symbol - pic_base), reg
@@ -51,7 +52,7 @@
 
 #define GRUB_BOOT_MACHINE_LIST_SIZE	12
 
-#define GRUB_BOOT_MACHINE_IMAGE_ADDRESS	0x200000
+#define GRUB_BOOT_MACHINE_IMAGE_ADDRESS	0x4400
 
 #define GRUB_BOOT_MACHINE_KERNEL_ADDR 0x4200
 
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index d0be7149c..933c46963 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -344,7 +344,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
 						   | AOUT32_OMAGIC);
       aout_head->a_text = grub_host_to_target32 (core_size);
-      aout_head->a_entry = grub_host_to_target32 (0x4400);
+      aout_head->a_entry
+	= grub_host_to_target32 (GRUB_BOOT_MACHINE_IMAGE_ADDRESS);
       memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
 
       free (core_img);