Fix raw image addresses

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 74f4ee0145a1ea7d02de7194fb2b099bdc7d3d39..1674060175fbb0dc4acb3504b365dbe07ecaafe2 100644 (file)
--- 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 5016bf9e09908a54890c08089d1449102c77f140..a4d4b5bf92e534688e74805e038580971524a54c 100644 (file)
--- 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 95f311ce51b4b9a2e88d6f491cca6cd28f7c6f8f..e1c1aa67590e43e4416bd7f2fb201983649e0d5e 100644 (file)
--- 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 d0be7149c82433022574bb49c76ab3c3ecce01fc..933c469634712769887b91a14c07b8d1a62f210c 100644 (file)
--- 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);