From 6bea3f8983a193bb26933556e12d5544d3aac75b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Feb 2010 20:08:56 +0100
Subject: [PATCH 1/5] merge sparc grub-mkimage into grub-mkrawimage

---
 conf/sparc64-ieee1275.rmk              |   2 +-
 configure.ac                           |   9 +-
 include/grub/sparc64/ieee1275/kernel.h |   2 +
 util/grub-mkrawimage.c                 |  26 ++-
 util/sparc64/ieee1275/grub-mkimage.c   | 300 -------------------------
 5 files changed, 35 insertions(+), 304 deletions(-)
 delete mode 100644 util/sparc64/ieee1275/grub-mkimage.c

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..6a91b40ee 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -62,7 +62,7 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.
diff --git a/configure.ac b/configure.ac
index 48702afd6..b5db67b7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,14 @@ case "$platform" in
   qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
   pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
+case "$target_cpu" in
+  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
+
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index e63e1f616..8eb1671a8 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -39,6 +39,8 @@
 /* End of the data section. */
 #define GRUB_KERNEL_MACHINE_DATA_END		0x114
 
+#define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
+
 #ifndef ASM_FILE
 
 #include <grub/symbol.h>
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 2316479e9..e17446f78 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -142,7 +142,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     }
 
   for (p = path_list; p; p = p->next)
-    total_module_size += (grub_util_get_image_size (p->name)
+    total_module_size += (ALIGN_UP (grub_util_get_image_size (p->name), 4)
 			  + sizeof (struct grub_module_header));
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
@@ -295,6 +295,30 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     core_img = rom_img;
     core_size = rom_size;
 
+    free (boot_img);
+    free (boot_path);
+  }
+#elif defined (GRUB_MACHINE_SPARC64)
+  {
+    unsigned int num;
+    char *boot_path, *boot_img;
+    size_t boot_size;
+
+    num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+    num <<= GRUB_DISK_SECTOR_BITS;
+
+    boot_path = grub_util_get_path (dir, "diskboot.img");
+    boot_size = grub_util_get_image_size (boot_path);
+    if (boot_size != GRUB_DISK_SECTOR_SIZE)
+      grub_util_error ("diskboot.img is not one sector size");
+
+    boot_img = grub_util_read_image (boot_path);
+
+    *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
+			 - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
+      = grub_host_to_target32 (num);
+
+    grub_util_write_image (boot_img, boot_size, out);
     free (boot_img);
     free (boot_path);
   }
diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
deleted file mode 100644
index 6907b8d8a..000000000
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* grub-mkimage.c - make a bootable image */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009,2010  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <config.h>
-#include <grub/types.h>
-#include <grub/machine/boot.h>
-#include <grub/machine/kernel.h>
-#include <grub/kernel.h>
-#include <grub/i18n.h>
-#include <grub/disk.h>
-#include <grub/util/misc.h>
-#include <grub/util/resolve.h>
-#include <grub/misc.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define _GNU_SOURCE	1
-#include <getopt.h>
-
-#include "progname.h"
-
-static void
-compress_kernel (char *kernel_img, size_t kernel_size,
-		 char **core_img, size_t *core_size)
-{
-  /* No compression support yet.  */
-  grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
-  *core_img = xmalloc (kernel_size);
-  memcpy (*core_img, kernel_img, kernel_size);
-  *core_size = kernel_size;
-}
-
-static void
-generate_image (const char *dir, const char *prefix, FILE *out, char *mods[], char *memdisk_path)
-{
-  size_t kernel_size, total_module_size, memdisk_size, core_size, boot_size, offset;
-  char *kernel_path, *kernel_img, *core_img, *boot_path, *boot_img;
-  struct grub_util_path_list *path_list, *p;
-  struct grub_module_info *modinfo;
-  grub_addr_t module_addr;
-  unsigned int num;
-
-  path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
-
-  kernel_path = grub_util_get_path (dir, "kernel.img");
-  kernel_size = grub_util_get_image_size (kernel_path);
-
-  total_module_size = sizeof (struct grub_module_info);
-  for (p = path_list; p; p = p->next)
-    total_module_size += (grub_util_get_image_size (p->name)
-			  + sizeof (struct grub_module_header));
-
-  memdisk_size = 0;
-  if (memdisk_path)
-    {
-      memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
-      grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
-      total_module_size += memdisk_size + sizeof (struct grub_module_header);
-    }
-
-  grub_util_info ("the total module size is 0x%x", total_module_size);
-
-  kernel_img = xmalloc (kernel_size + total_module_size);
-  grub_util_load_image (kernel_path, kernel_img);
-
-  if ((GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1)
-      > GRUB_KERNEL_MACHINE_DATA_END)
-    grub_util_error ("prefix too long");
-  strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
-
-  /* Fill in the grub_module_info structure.  */
-  modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
-  modinfo->magic = GRUB_MODULE_MAGIC;
-  modinfo->offset = sizeof (struct grub_module_info);
-  modinfo->size = total_module_size;
-
-  offset = kernel_size + sizeof (struct grub_module_info);
-  for (p = path_list; p; p = p->next)
-    {
-      struct grub_module_header *header;
-      size_t mod_size;
-
-      mod_size = grub_util_get_image_size (p->name);
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      header->type = OBJ_TYPE_ELF;
-      header->size = grub_host_to_target32 (mod_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (p->name, kernel_img + offset);
-      offset += mod_size;
-    }
-
-  if (memdisk_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      header->type = OBJ_TYPE_MEMDISK;
-      header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (memdisk_path, kernel_img + offset);
-      offset += memdisk_size;
-    }
-
-  compress_kernel (kernel_img, kernel_size + total_module_size,
-		   &core_img, &core_size);
-
-  grub_util_info ("the core size is 0x%x", core_size);
-
-  num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-  num <<= GRUB_DISK_SECTOR_BITS;
-
-  boot_path = grub_util_get_path (dir, "diskboot.img");
-  boot_size = grub_util_get_image_size (boot_path);
-  if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("diskboot.img is not one sector size");
-
-  boot_img = grub_util_read_image (boot_path);
-
-  /* sparc is a big endian architecture.  */
-  *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
-		       - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-    = grub_cpu_to_be32 (num);
-
-  grub_util_write_image (boot_img, boot_size, out);
-  free (boot_img);
-  free (boot_path);
-
-  module_addr = (path_list
-		 ? (GRUB_BOOT_MACHINE_IMAGE_ADDRESS + kernel_size)
-		 : 0);
-
-  grub_util_info ("the first module address is 0x%x", module_addr);
-
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_cpu_to_be32 (total_module_size);
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_cpu_to_be32 (kernel_size);
-
-  /* No compression support yet.  */
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_cpu_to_be32 (0);
-
-  grub_util_write_image (core_img, core_size, out);
-  free (kernel_img);
-  free (core_img);
-  free (kernel_path);
-
-  while (path_list)
-    {
-      struct grub_util_path_list *next = path_list->next;
-      free ((void *) path_list->name);
-      free (path_list);
-      path_list = next;
-    }
-}
-
-static struct option options[] =
-  {
-    {"directory", required_argument, 0, 'd'},
-    {"prefix", required_argument, 0, 'p'},
-    {"memdisk", required_argument, 0, 'm'},
-    {"output", required_argument, 0, 'o'},
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    {0, 0, 0, 0}
-  };
-
-static void
-usage (int status)
-{
-  if (status)
-    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
-  else
-    printf ("\
-Usage: %s [OPTION]... [MODULES]\n\
-\n\
-Make a bootable image of GRUB.\n\
-\n\
-  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
-  -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
-  -m, --memdisk=FILE      embed FILE as a memdisk image\n\
-  -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
-  -h, --help              display this message and exit\n\
-  -V, --version           print version information and exit\n\
-  -v, --verbose           print verbose messages\n\
-\n\
-Report bugs to <%s>.\n\
-", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
-
-  exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *output = NULL;
-  char *dir = NULL;
-  char *prefix = NULL;
-  char *memdisk = NULL;
-  FILE *fp = stdout;
-
-  set_program_name (argv[0]);
-
-  grub_util_init_nls ();
-
-  while (1)
-    {
-      int c = getopt_long (argc, argv, "d:p:m:o:hVv", options, 0);
-
-      if (c == -1)
-	break;
-      else
-	switch (c)
-	  {
-	  case 'o':
-	    if (output)
-	      free (output);
-	    output = xstrdup (optarg);
-	    break;
-
-	  case 'd':
-	    if (dir)
-	      free (dir);
-	    dir = xstrdup (optarg);
-	    break;
-
-	  case 'm':
-	    if (memdisk)
-	      free (memdisk);
-	    memdisk = xstrdup (optarg);
-
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup ("(memdisk)/boot/grub");
-	    break;
-
-	  case 'h':
-	    usage (0);
-	    break;
-
-	  case 'p':
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup (optarg);
-	    break;
-
-	  case 'V':
-	    printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	    return 0;
-
-	  case 'v':
-	    verbosity++;
-	    break;
-
-	  default:
-	    usage (1);
-	    break;
-	  }
-    }
-
-  if (output)
-    {
-      fp = fopen (output, "wb");
-      if (! fp)
-	grub_util_error ("cannot open %s", output);
-    }
-
-  generate_image (dir ? : GRUB_LIBDIR,
-		  prefix ? : DEFAULT_DIRECTORY, fp,
-		  argv + optind, memdisk);
-
-  fclose (fp);
-
-  if (dir)
-    free (dir);
-
-  return 0;
-}

From a49217cff7157395f3770f84fd5b1f01d107cce3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:26:50 +0100
Subject: [PATCH 2/5] aout image support

---
 boot/sparc64/ieee1275/diskboot.S       |   2 +-
 conf/sparc64-ieee1275.rmk              |   2 +-
 include/grub/aout.h                    |   5 +
 include/grub/kernel.h                  |   2 +
 include/grub/sparc64/ieee1275/kernel.h |  13 +++
 kern/main.c                            |  19 ++++
 kern/mips/yeeloong/init.c              |  28 +-----
 kern/sparc64/ieee1275/crt0.S           |   2 +-
 kern/sparc64/ieee1275/init.c           |   2 +-
 util/grub-mkrawimage.c                 | 128 +++++++++++++++----------
 10 files changed, 122 insertions(+), 81 deletions(-)

diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index 68ed0eee0..5016bf9e0 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -129,7 +129,7 @@ bootit:
 	 mov	NOTIFICATION_DONE_LEN, %o3
 	sethi	%hi(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o2
 	jmpl	%o2 + %lo(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o7
-	 mov	CIF_REG, %o0
+	 mov	CIF_REG, %o4
 1:	ba,a	1b
 
 lastlist:
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 6a91b40ee..4b51a5c3e 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -48,7 +48,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
+kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc -static-libgcc -lgcc
 kernel_img_FORMAT = binary
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
diff --git a/include/grub/aout.h b/include/grub/aout.h
index 04e85f8b0..f962a97b3 100644
--- a/include/grub/aout.h
+++ b/include/grub/aout.h
@@ -102,6 +102,7 @@ union grub_aout_header
 #define AOUT_MID_I386		134	/* i386 BSD binary */
 #define AOUT_MID_SPARC		138	/* sparc */
 #define	AOUT_MID_HP200		200	/* hp200 (68010) BSD binary */
+#define	AOUT_MID_SUN            0x103
 #define	AOUT_MID_HP300		300	/* hp300 (68020+68881) BSD binary */
 #define	AOUT_MID_HPUX		0x20C	/* hp200/300 HP-UX binary */
 #define	AOUT_MID_HPUX800	0x20B	/* hp800 HP-UX binary */
@@ -114,10 +115,14 @@ union grub_aout_header
 #define AOUT_GETMID(header) ((header).a_midmag >> 16) & 0x03ff)
 #define AOUT_GETFLAG(header) ((header).a_midmag >> 26) & 0x3f)
 
+#ifndef GRUB_UTIL
+
 int EXPORT_FUNC(grub_aout_get_type) (union grub_aout_header *header);
 
 grub_err_t EXPORT_FUNC(grub_aout_load) (grub_file_t file, int offset,
                                         grub_addr_t load_addr, int load_size,
                                         grub_addr_t bss_end_addr);
 
+#endif
+
 #endif /* ! GRUB_AOUT_HEADER */
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 9586a90b9..bf52ffcb4 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -59,6 +59,8 @@ extern grub_addr_t grub_arch_modules_addr (void);
 
 extern void EXPORT_FUNC(grub_module_iterate) (int (*hook) (struct grub_module_header *));
 
+grub_addr_t grub_modules_get_end (void);
+
 /* The start point of the C code.  */
 void grub_main (void);
 
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 8eb1671a8..78e039bc5 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -41,8 +41,21 @@
 
 #define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, aout"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+
 #ifndef ASM_FILE
 
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_AOUT
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_AOUT GRUB_PLATFORM_IMAGE_AOUT
+
 #include <grub/symbol.h>
 #include <grub/types.h>
 
diff --git a/kern/main.c b/kern/main.c
index 456105378..54235821d 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -53,6 +53,25 @@ grub_module_iterate (int (*hook) (struct grub_module_header *header))
     }
 }
 
+/* This is actualy platform-independant but used only on yeeloong and sparc.  */
+#if defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_SPARC64)
+grub_addr_t
+grub_modules_get_end (void)
+{
+  struct grub_module_info *modinfo;
+  grub_addr_t modbase;
+
+  modbase = grub_arch_modules_addr ();
+  modinfo = (struct grub_module_info *) modbase;
+
+  /* Check if there are any modules.  */
+  if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC)
+    return modbase;
+
+  return modbase + modinfo->size;
+}
+#endif
+
 /* Load all modules in core.  */
 static void
 grub_load_modules (void)
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 14e8a39a2..d148d08dc 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -63,35 +63,13 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
-
-static void *
-get_modules_end (void)
-{
-  struct grub_module_info *modinfo;
-  struct grub_module_header *header;
-  grub_addr_t modbase;
-
-  modbase = grub_arch_modules_addr ();
-  modinfo = (struct grub_module_info *) modbase;
-
-  /* Check if there are any modules.  */
-  if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC)
-    return modinfo;
-
-  for (header = (struct grub_module_header *) (modbase + modinfo->offset);
-       header < (struct grub_module_header *) (modbase + modinfo->size);
-       header = (struct grub_module_header *) ((char *) header + header->size));
-
-  return header;
-}
-
 void
 grub_machine_init (void)
 {
-  void *modend;
-  modend = get_modules_end ();
+  grub_addr_t modend;
+  modend = grub_modules_get_end ();
   grub_mm_init_region (modend, (grub_arch_memsize << 20)
-		       - (((grub_addr_t) modend) - GRUB_ARCH_LOWMEMVSTART));
+		       - (modend - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);
 
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index 4e67cbc19..1dc65dc64 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -24,7 +24,7 @@
 	.globl	_start
 _start:
 	ba	codestart
-	 nop
+	 mov  %o4, %o0
 
 	. = EXT_C(_start) + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 115328f40..5827be658 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -104,7 +104,7 @@ grub_machine_set_prefix (void)
 static void
 grub_heap_init (void)
 {
-  grub_mm_init_region ((void *)(long)0x4000UL, 0x200000 - 0x4000);
+  grub_mm_init_region ((void *) grub_modules_get_end (), 0x200000);
 }
 
 static void
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index e17446f78..26ccd7d94 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -23,6 +23,7 @@
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
 #include <grub/elf.h>
+#include <grub/aout.h>
 #include <grub/i18n.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
@@ -230,6 +231,36 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   grub_util_info ("the core size is 0x%x", core_size);
 
+#ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
+    = grub_host_to_target32 (total_module_size);
+#endif
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
+    = grub_host_to_target32 (kernel_size);
+#ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
+    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
+#endif
+
+#if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
+  /* If we included a drive in our prefix, let GRUB know it doesn't have to
+     prepend the drive told by BIOS.  */
+  if (prefix[0] == '(')
+    {
+      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
+	= grub_host_to_target32 (-2);
+      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
+	= grub_host_to_target32 (-2);
+    }
+#endif
+
+#ifdef GRUB_MACHINE_PCBIOS
+  if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
+    grub_util_error (_("core image is too big (%p > %p)"),
+ 		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
+		     GRUB_MEMORY_MACHINE_UPPER);
+#endif
+
 #if defined(GRUB_MACHINE_PCBIOS)
   {
     unsigned num;
@@ -299,62 +330,50 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     free (boot_path);
   }
 #elif defined (GRUB_MACHINE_SPARC64)
-  {
-    unsigned int num;
-    char *boot_path, *boot_img;
-    size_t boot_size;
-
-    num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-    num <<= GRUB_DISK_SECTOR_BITS;
-
-    boot_path = grub_util_get_path (dir, "diskboot.img");
-    boot_size = grub_util_get_image_size (boot_path);
-    if (boot_size != GRUB_DISK_SECTOR_SIZE)
-      grub_util_error ("diskboot.img is not one sector size");
-
-    boot_img = grub_util_read_image (boot_path);
-
-    *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
-			 - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-      = grub_host_to_target32 (num);
-
-    grub_util_write_image (boot_img, boot_size, out);
-    free (boot_img);
-    free (boot_path);
-  }
-#endif
-
-#ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_host_to_target32 (total_module_size);
-#endif
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_host_to_target32 (kernel_size);
-#ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
-#endif
-
-#if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
-  /* If we included a drive in our prefix, let GRUB know it doesn't have to
-     prepend the drive told by BIOS.  */
-  if (prefix[0] == '(')
+  if (format == GRUB_PLATFORM_IMAGE_AOUT)
     {
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
-	= grub_host_to_target32 (-2);
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
-	= grub_host_to_target32 (-2);
+      void *aout_img;
+      size_t aout_size;
+      struct grub_aout32_header *aout_head;
+
+      aout_size = core_size + sizeof (*aout_head);
+      aout_img = xmalloc (aout_size);
+      aout_head = aout_img;
+      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);
+      memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
+
+      free (core_img);
+      core_img = aout_img;
+      core_size = aout_size;
     }
-#endif
+  else
+    {
+      unsigned int num;
+      char *boot_path, *boot_img;
+      size_t boot_size;
 
-#ifdef GRUB_MACHINE_PCBIOS
-  if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
-    grub_util_error (_("core image is too big (%p > %p)"),
- 		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
-		     GRUB_MEMORY_MACHINE_UPPER);
-#endif
+      num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+      num <<= GRUB_DISK_SECTOR_BITS;
 
-#if defined(GRUB_MACHINE_MIPS)
+      boot_path = grub_util_get_path (dir, "diskboot.img");
+      boot_size = grub_util_get_image_size (boot_path);
+      if (boot_size != GRUB_DISK_SECTOR_SIZE)
+	grub_util_error ("diskboot.img is not one sector size");
+
+      boot_img = grub_util_read_image (boot_path);
+
+      *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
+			   - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
+	= grub_host_to_target32 (num);
+
+      grub_util_write_image (boot_img, boot_size, out);
+      free (boot_img);
+      free (boot_path);
+    }
+#elif defined(GRUB_MACHINE_MIPS)
   if (format == GRUB_PLATFORM_IMAGE_ELF)
     {
       char *elf_img;
@@ -527,6 +546,11 @@ main (int argc, char *argv[])
 	    if (strcmp (optarg, "elf") == 0)
 	      format = GRUB_PLATFORM_IMAGE_ELF;
 	    else 
+#endif
+#ifdef GRUB_PLATFORM_IMAGE_AOUT
+	    if (strcmp (optarg, "aout") == 0)
+	      format = GRUB_PLATFORM_IMAGE_AOUT;
+	    else 
 #endif
 	      usage (1);
 	    break;

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 3/5] 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);

From 320dd174b5efd6dd7fde6636180f0547aaaae889 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:32:21 +0100
Subject: [PATCH 4/5] Increase stack size on sparc

---
 include/grub/sparc64/ieee1275/ieee1275.h |  2 ++
 include/grub/sparc64/ieee1275/kernel.h   |  1 +
 kern/sparc64/ieee1275/crt0.S             | 16 +++++++++++++---
 kern/sparc64/ieee1275/init.c             |  6 +++++-
 loader/sparc64/ieee1275/linux.c          | 17 +++++++++++------
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
index 527c46ae7..32c77f80f 100644
--- a/include/grub/sparc64/ieee1275/ieee1275.h
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
@@ -43,4 +43,6 @@ extern int EXPORT_FUNC(grub_ieee1275_alloc_physmem) (grub_addr_t *paddr,
 						     grub_size_t size,
 						     grub_uint32_t align);
 
+extern grub_addr_t EXPORT_VAR (grub_ieee1275_original_stack);
+
 #endif /* ! GRUB_IEEE1275_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 78e039bc5..a16fb88e7 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -40,6 +40,7 @@
 #define GRUB_KERNEL_MACHINE_DATA_END		0x114
 
 #define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
+#define GRUB_KERNEL_MACHINE_STACK_SIZE          0x40000
 
 #define GRUB_PLATFORM_IMAGE_FORMATS     "raw, aout"
 #define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index f1ff6b466..d5a172296 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -53,8 +53,17 @@ codestart:
 	or	%o3, %lo(_end), %o3
 	sethi	%hi(grub_total_module_size), %o4
 	lduw	[%o4 + %lo(grub_total_module_size)], %o4
+
 	add     %o2, %o4, %o2
 	add     %o3, %o4, %o3
+
+	/* Save ieee1275 stack for future use by booter.  */
+	mov     %o6, %o1
+	/* Our future stack.  */
+	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	add     %o3, %o5, %o6
+	
 	sub	%o2, 4, %o2
 	sub	%o3, 4, %o3
 1:	lduw	[%o2], %o5
@@ -62,7 +71,7 @@ codestart:
 	subcc	%o4, 4, %o4
 	sub	%o2, 4, %o2
 	bne,pt	%icc, 1b
-	  sub	%o3, 4, %o3
+	 sub	%o3, 4, %o3
 
 	/* Now it's safe to clear out the BSS.  */
 	sethi	%hi(__bss_start), %o2
@@ -74,8 +83,9 @@ codestart:
 	cmp	%o2, %o3
 	blt,pt	%xcc, 1b
 	 nop
+	sethi	%hi(grub_ieee1275_original_stack), %o2
+	stx	%o1, [%o2 + %lo(grub_ieee1275_original_stack)]
 	sethi	%hi(grub_ieee1275_entry_fn), %o2
-	stx	%o0, [%o2 + %lo(grub_ieee1275_entry_fn)]
 	call	grub_main
-	 nop
+	 stx	%o0, [%o2 + %lo(grub_ieee1275_entry_fn)]
 1:	ba,a	1b
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 5827be658..a995217bc 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -23,12 +23,15 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 #include <grub/time.h>
+#include <grub/machine/boot.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/time.h>
 #include <grub/ieee1275/ofdisk.h>
 #include <grub/ieee1275/ieee1275.h>
 
+grub_addr_t grub_ieee1275_original_stack;
+
 void
 grub_exit (void)
 {
@@ -104,7 +107,8 @@ grub_machine_set_prefix (void)
 static void
 grub_heap_init (void)
 {
-  grub_mm_init_region ((void *) grub_modules_get_end (), 0x200000);
+  grub_mm_init_region ((void *) (grub_modules_get_end ()
+				 + GRUB_KERNEL_MACHINE_STACK_SIZE), 0x200000);
 }
 
 static void
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 24a6849a6..f55b4fa2a 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -58,9 +58,6 @@ static grub_size_t linux_size;
 
 static char *linux_args;
 
-typedef void (*kernel_entry_t) (unsigned long, unsigned long,
-				unsigned long, unsigned long, int (void *));
-
 struct linux_bootstr_info {
 	int len, valid;
 	char buf[];
@@ -92,7 +89,6 @@ static grub_err_t
 grub_linux_boot (void)
 {
   struct linux_bootstr_info *bp;
-  kernel_entry_t linuxmain;
   struct linux_hdrs *hp;
   grub_addr_t addr;
 
@@ -141,8 +137,17 @@ grub_linux_boot (void)
   grub_dprintf ("loader", "Jumping to Linux...\n");
 
   /* Boot the kernel.  */
-  linuxmain = (kernel_entry_t) linux_addr;
-  linuxmain (0, 0, 0, 0, grub_ieee1275_entry_fn);
+  asm volatile ("sethi	%hi(grub_ieee1275_entry_fn), %o1\n"
+		"ldx	[%o1 + %lo(grub_ieee1275_entry_fn)], %o4\n"
+		"sethi	%hi(grub_ieee1275_original_stack), %o1\n"
+		"ldx	[%o1 + %lo(grub_ieee1275_original_stack)], %o6\n"
+		"sethi	%hi(linux_addr), %o1\n"
+		"ldx	[%o1 + %lo(linux_addr)], %o5\n"
+		"mov    %g0, %o0\n"
+		"mov    %g0, %o2\n"
+		"mov    %g0, %o3\n"
+		"jmp    %o5\n"
+	        "mov    %g0, %o1\n");
 
   return GRUB_ERR_NONE;
 }

From 13b6d963eaf38d6029b5c3a2f696a573a55a97b3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Feb 2010 19:03:07 +0100
Subject: [PATCH 5/5] Fix yeeloong compilation

---
 kern/mips/yeeloong/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index d148d08dc..1a29a9af6 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -68,7 +68,7 @@ grub_machine_init (void)
 {
   grub_addr_t modend;
   modend = grub_modules_get_end ();
-  grub_mm_init_region (modend, (grub_arch_memsize << 20)
+  grub_mm_init_region ((void *) modend, (grub_arch_memsize << 20)
 		       - (modend - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);