From 6e86896ed8bd6ce55592092c30e0c087d902cae8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 14:02:13 +0200
Subject: [PATCH 1/6] Use ofpathname in grub-setup on sparc

---
 conf/powerpc-ieee1275.rmk                     |  7 ++++
 conf/sparc64-ieee1275.rmk                     |  1 +
 include/grub/util/hostdisk.h                  |  3 ++
 include/grub/util/ofpath.h                    |  2 +-
 util/hostdisk.c                               |  6 ++++
 util/{sparc64 => }/ieee1275/grub-ofpathname.c |  0
 util/ieee1275/ofpath.c                        |  2 +-
 util/sparc64/ieee1275/grub-setup.c            | 34 ++++---------------
 8 files changed, 26 insertions(+), 29 deletions(-)
 rename util/{sparc64 => }/ieee1275/grub-ofpathname.c (100%)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d5968ac8e..d7d477327 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -25,6 +25,13 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
+# Utilities.
+sbin_UTILITIES = grub-ofpathname
+
+# For grub-ofpathname.
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
+	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
+
 # Scripts.
 sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 72f947f6a..a92e66a80 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -50,6 +50,7 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
+	util/ieee1275/ofpath.c \
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
 	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
 	kern/file.c kern/fs.c kern/env.c kern/list.c		\
diff --git a/include/grub/util/hostdisk.h b/include/grub/util/hostdisk.h
index 21efb0d17..246046ee0 100644
--- a/include/grub/util/hostdisk.h
+++ b/include/grub/util/hostdisk.h
@@ -20,8 +20,11 @@
 #ifndef GRUB_BIOSDISK_MACHINE_UTIL_HEADER
 #define GRUB_BIOSDISK_MACHINE_UTIL_HEADER	1
 
+#include <grub/disk.h>
+
 void grub_util_biosdisk_init (const char *dev_map);
 void grub_util_biosdisk_fini (void);
 char *grub_util_biosdisk_get_grub_dev (const char *os_dev);
+const char *grub_util_biosdisk_get_osdev (grub_disk_t disk);
 
 #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */
diff --git a/include/grub/util/ofpath.h b/include/grub/util/ofpath.h
index 78f24d784..b43c523cb 100644
--- a/include/grub/util/ofpath.h
+++ b/include/grub/util/ofpath.h
@@ -1,6 +1,6 @@
 #ifndef GRUB_OFPATH_MACHINE_UTIL_HEADER
 #define GRUB_OFPATH_MACHINE_UTIL_HEADER	1
 
-char *grub_util_devname_to_ofpath (char *devname);
+char *grub_util_devname_to_ofpath (const char *devname);
 
 #endif /* ! GRUB_OFPATH_MACHINE_UTIL_HEADER */
diff --git a/util/hostdisk.c b/util/hostdisk.c
index a8e418046..8be487461 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -1352,3 +1352,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   return make_device_name (drive, -1, -1);
 #endif
 }
+
+const char *
+grub_util_biosdisk_get_osdev (grub_disk_t disk)
+{
+  return map[disk->id].device;
+}
diff --git a/util/sparc64/ieee1275/grub-ofpathname.c b/util/ieee1275/grub-ofpathname.c
similarity index 100%
rename from util/sparc64/ieee1275/grub-ofpathname.c
rename to util/ieee1275/grub-ofpathname.c
diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index 79a0e8be5..fa0d48cf9 100644
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -368,7 +368,7 @@ strip_trailing_digits (const char *p)
 }
 
 char *
-grub_util_devname_to_ofpath (char *devname)
+grub_util_devname_to_ofpath (const char *devname)
 {
   char *name_buf, *device, *devnode, *devicenode, *ofpath;
 
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index c39ea853f..cfd58a08f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -35,6 +35,7 @@
 #include <grub/term.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
+#include <grub/util/ofpath.h>
 
 #include <grub_setup_init.h>
 
@@ -103,28 +104,6 @@ grub_refresh (void)
   fflush (stdout);
 }
 
-static char *compute_dest_ofpath (const char *dest)
-{
-  int len = strlen (dest);
-  char *res, *p, c;
-
-  res = xmalloc (len);
-  p = res;
-  while ((c = *dest++) != '\0')
-    {
-      if (c == '\\' && *dest == ',')
-	{
-	  *p++ = ',';
-	  dest++;
-	}
-      else
-	*p++ = c;
-    }
-  *p++ = '\0';
-
-  return res;
-}
-
 static void
 setup (const char *prefix, const char *dir,
        const char *boot_file, const char *core_file,
@@ -195,8 +174,6 @@ setup (const char *prefix, const char *dir,
       last_length = length;
     }
 
-  dest_ofpath = compute_dest_ofpath (dest);
-
   /* Read the boot image by the OS service.  */
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
@@ -229,8 +206,7 @@ setup (const char *prefix, const char *dir,
 					   + GRUB_DISK_SECTOR_SIZE
 					   - sizeof (*block));
 
-  grub_util_info ("root is `%s', dest is `%s', and dest_ofpath is `%s'",
-		  root, dest, dest_ofpath);
+  grub_util_info ("root is `%s', dest is `%s'", root, dest);
 
   /* Open the root device and the destination device.  */
   grub_util_info ("Opening root");
@@ -243,6 +219,11 @@ setup (const char *prefix, const char *dir,
   if (! dest_dev)
     grub_util_error ("%s", grub_errmsg);
 
+  dest_ofpath
+    = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (dest_dev->disk));
+
+  grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
+
   grub_util_info ("setting the root device to `%s'", root);
   if (grub_env_set ("root", root) != GRUB_ERR_NONE)
     grub_util_error ("%s", grub_errmsg);
@@ -449,7 +430,6 @@ init_info (struct grub_setup_info *gp)
   gp->dev_map = NULL;
   gp->root_dev = NULL;
   gp->prefix = NULL;
-  gp->dest_dev = NULL;
 }
 
 static int

From d0faf8a1b3c0a8e21b4ef17e10118a8b336a216c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 16:31:27 +0200
Subject: [PATCH 2/6] Correct path to grub-ofpathname

---
 conf/sparc64-ieee1275.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index a92e66a80..c82bd81f3 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -70,7 +70,7 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	grub_setup_init.c
 
 # For grub-ofpathname.
-grub_ofpathname_SOURCES = util/sparc64/ieee1275/grub-ofpathname.c \
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
 	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
 
 # Scripts.

From ee9056d097bafe2324d4adaf912364aa9e7fd296 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 16:35:08 +0200
Subject: [PATCH 3/6] Support cross-disk installs. On non-cross-disk retrieve
 bootpath from chosen/bootpath

---
 boot/sparc64/ieee1275/boot.S         | 16 ++++++++++++++++
 include/grub/sparc64/ieee1275/boot.h |  4 ++--
 util/sparc64/ieee1275/grub-setup.c   | 27 +++++++++++++++++++--------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 167406017..4008b1b54 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -152,6 +152,22 @@ boot_continue:
 	call	console_write
 	 mov	GRUB_NAME_LEN, %o3
 
+	GET_ABS(boot_path, %o3)
+	ldub	[%o3], %o1
+	brnz,pn	%o1, bootpath_known
+	 mov	4, %g1
+
+	/* getprop(chosen_node, "bootpath", &buffer, buffer_size) */
+	 GET_ABS(prom_getprop_name, %o0)
+	mov	1, %o5
+	mov	CHOSEN_NODE_REG, %o1
+	GET_ABS(prom_bootpath_name, %o2)
+	mov	(kernel_sector - boot_path), %o4
+	call	prom_call
+	 stx	%g1, [%l1 + 256]
+
+bootpath_known:	
+
 	/* Open up the boot_path, and use that handle to read the
 	 * first block of the GRUB kernel image.
 	 *
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index e1c1aa675..7b2137664 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -43,9 +43,9 @@
 
 #define GRUB_BOOT_MACHINE_BOOT_DEVPATH	0x0a
 
-#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END 0x80
+#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END (0x80 - 40)
 
-#define GRUB_BOOT_MACHINE_KERNEL_SECTOR 0x88
+#define GRUB_BOOT_MACHINE_KERNEL_SECTOR (0x80 - 40)
 
 #define GRUB_BOOT_MACHINE_CODE_END \
 	(0x1fc - GRUB_BOOT_AOUT_HEADER_SIZE)
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index cfd58a08f..97cc89301 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -114,7 +114,7 @@ setup (const char *prefix, const char *dir,
   size_t boot_size, core_size;
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
-  char *boot_devpath, *dest_ofpath;
+  char *boot_devpath;
   grub_disk_addr_t *kernel_sector;
   struct boot_blocklist *first_block, *block;
   char *tmp_img;
@@ -219,11 +219,6 @@ setup (const char *prefix, const char *dir,
   if (! dest_dev)
     grub_util_error ("%s", grub_errmsg);
 
-  dest_ofpath
-    = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (dest_dev->disk));
-
-  grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
-
   grub_util_info ("setting the root device to `%s'", root);
   if (grub_env_set ("root", root) != GRUB_ERR_NONE)
     grub_util_error ("%s", grub_errmsg);
@@ -332,6 +327,24 @@ setup (const char *prefix, const char *dir,
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
     grub_util_error ("failed to read the rest sectors of the core image");
 
+  if (file->device->disk->id != dest_dev->disk->id)
+    {
+      const char *dest_ofpath;
+      dest_ofpath
+	= grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (file->device->disk));
+      grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
+      strncpy (boot_devpath, dest_ofpath, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+	       - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1);
+      boot_devpath[GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+		   - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1] = 0;
+    }
+  else
+    {
+      grub_util_info ("non cross-disk install");
+      memset (boot_devpath, 0, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+	      - GRUB_BOOT_MACHINE_BOOT_DEVPATH);
+    }
+
   grub_file_close (file);
 
   free (core_path);
@@ -339,8 +352,6 @@ setup (const char *prefix, const char *dir,
 
   *kernel_sector = grub_cpu_to_be64 (first_sector);
 
-  strcpy(boot_devpath, dest_ofpath);
-
   grub_util_info ("boot device path %s, prefix is %s, dest is %s",
 		  boot_devpath, prefix, dest);
 

From b076cdc730408d5d5ae0c6279b2560e3de1582fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 18:22:58 +0200
Subject: [PATCH 4/6] Shave off bytes to compensate boot.img size increase

---
 boot/sparc64/ieee1275/boot.S         | 73 +++++++++++++---------------
 include/grub/sparc64/ieee1275/boot.h |  4 +-
 util/sparc64/ieee1275/grub-setup.c   | 10 ++--
 3 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 4008b1b54..f08258f47 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -45,8 +45,9 @@ boot_version:		.byte	GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 	 * load address plus the size of the prepended A.OUT header (32 bytes).
 	 */
 boot_path:
-	. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
-kernel_sector:		.xword 2
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
+boot_path_end:
+kernel_byte:		.xword (2 << 9)
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 
 prom_finddev_name:	.asciz "finddevice"
@@ -77,11 +78,23 @@ prom_error:
 	/* %o0: OF call name
 	 * %o1: input arg 1
 	 */
-prom_call_1_1:
-	mov	1, %g1
-	ba	prom_call
-	 mov	1, %o5
+prom_call_1_1_o2:
+	clr	%o2
+	ba	prom_call_x_1
+	 mov	1, %g1
 
+prom_call_getprop:
+	mov	4, %g1
+	stx	%g1, [%l1 + 256]
+	mov	CHOSEN_NODE_REG, %o1
+	ba	prom_call_x_1
+	 GET_ABS(prom_getprop_name, %o0)
+
+prom_call_3_1_o1:
+	ba prom_call_3_1
+	 mov	BOOTDEV_REG, %o1
+
+	
 	/* %o2: message string
 	 * %o3: message length
 	 */
@@ -95,8 +108,9 @@ console_write:
 	 * %o2: input arg 2
 	 * %o3: input arg 3
 	 */
-prom_call_3_1:
+prom_call_3_1:	
 	mov	3, %g1
+prom_call_x_1:
 	mov	1, %o5
 	/* fallthru */
 
@@ -126,23 +140,17 @@ boot_continue:
 	 * chosen_node = prom_finddevice("/chosen")
 	 */
 	GET_ABS(prom_finddev_name, %o0)
-	GET_ABS(prom_chosen_path, %o1)
-	call	prom_call_1_1
-	 clr	%o2
+	call	prom_call_1_1_o2
+	 GET_ABS(prom_chosen_path, %o1)
 
 	ldx	[%l1 + 0x20], CHOSEN_NODE_REG
 	brz	CHOSEN_NODE_REG, prom_error
 
 	/* getprop(chosen_node, "stdout", &buffer, buffer_size) */
-	 GET_ABS(prom_getprop_name, %o0)
-	mov	4, %g1
-	mov	1, %o5
-	mov	CHOSEN_NODE_REG, %o1
-	GET_ABS(prom_stdout_name, %o2)
+	 GET_ABS(prom_stdout_name, %o2)
 	add	%l1, 256, %o3
-	mov	1024, %o4
-	call	prom_call
-	 stx	%g1, [%l1 + 256]
+	call	prom_call_getprop
+	 mov	1024, %o4
 
 	lduw	[%l1 + 256], STDOUT_NODE_REG
 	brz,pn	STDOUT_NODE_REG, prom_error
@@ -155,16 +163,11 @@ boot_continue:
 	GET_ABS(boot_path, %o3)
 	ldub	[%o3], %o1
 	brnz,pn	%o1, bootpath_known
-	 mov	4, %g1
 
 	/* getprop(chosen_node, "bootpath", &buffer, buffer_size) */
-	 GET_ABS(prom_getprop_name, %o0)
-	mov	1, %o5
-	mov	CHOSEN_NODE_REG, %o1
-	GET_ABS(prom_bootpath_name, %o2)
-	mov	(kernel_sector - boot_path), %o4
-	call	prom_call
-	 stx	%g1, [%l1 + 256]
+	 GET_ABS(prom_bootpath_name, %o2)
+	call	prom_call_getprop
+	 mov	(boot_path_end - boot_path), %o4
 
 bootpath_known:	
 
@@ -174,9 +177,8 @@ bootpath_known:
 	 * bootdev_handle = open(boot_path)
 	 */
 	GET_ABS(prom_open_name, %o0)
-	GET_ABS(boot_path, %o1)
-	call	prom_call_1_1
-	 clr	%o2
+	call	prom_call_1_1_o2
+	 GET_ABS(boot_path, %o1)
 
 	ldx	[%l1 + 0x20], BOOTDEV_REG
 	brz,pn	BOOTDEV_REG, prom_open_error
@@ -184,28 +186,23 @@ bootpath_known:
 	/* Since we have 64-bit cells, the high cell of the seek offset
 	 * is zero and the low cell is the entire value.
 	 *
-	 * seek(bootdev, 0, *kernel_sector << 9)
+	 * seek(bootdev, 0, *kernel_byte)
 	 */
 	 GET_ABS(prom_seek_name, %o0)
-	mov	BOOTDEV_REG, %o1
 	clr	%o2
-	LDX_ABS(kernel_sector, 0x00, %o3)
-	call	prom_call_3_1
-	 sllx	%o3, 9, %o3
+	call	prom_call_3_1_o1
+	 LDX_ABS(kernel_byte, 0x00, %o3)
 
 	/* read(bootdev, *kernel_address, 512) */
 	GET_ABS(prom_read_name, %o0)
-	mov	BOOTDEV_REG, %o1
 	LDUW_ABS(kernel_address, 0x00, %o2)
-	call	prom_call_3_1
+	call	prom_call_3_1_o1
 	 mov	512, %o3
 
 	LDUW_ABS(kernel_address, 0x00, %o2)
 	jmpl	%o2, %o7
 	 nop
 
-1:	ba,a	1b
-
 	. = _start + GRUB_BOOT_MACHINE_CODE_END
 
 /* the last 4 bytes in the sector 0 contain the signature */
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index 7b2137664..9671c6900 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -43,9 +43,9 @@
 
 #define GRUB_BOOT_MACHINE_BOOT_DEVPATH	0x0a
 
-#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END (0x80 - 40)
+#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END 0x80
 
-#define GRUB_BOOT_MACHINE_KERNEL_SECTOR (0x80 - 40)
+#define GRUB_BOOT_MACHINE_KERNEL_BYTE 0x80
 
 #define GRUB_BOOT_MACHINE_CODE_END \
 	(0x1fc - GRUB_BOOT_AOUT_HEADER_SIZE)
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 97cc89301..34a006d7f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -115,7 +115,7 @@ setup (const char *prefix, const char *dir,
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
   char *boot_devpath;
-  grub_disk_addr_t *kernel_sector;
+  grub_disk_addr_t *kernel_byte;
   struct boot_blocklist *first_block, *block;
   char *tmp_img;
   int i;
@@ -187,9 +187,9 @@ setup (const char *prefix, const char *dir,
   boot_devpath = (char *) (boot_img
 			   + GRUB_BOOT_AOUT_HEADER_SIZE
 			   + GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-  kernel_sector = (grub_disk_addr_t *) (boot_img
-					+ GRUB_BOOT_AOUT_HEADER_SIZE
-					+ GRUB_BOOT_MACHINE_KERNEL_SECTOR);
+  kernel_byte = (grub_disk_addr_t *) (boot_img
+				      + GRUB_BOOT_AOUT_HEADER_SIZE
+				      + GRUB_BOOT_MACHINE_KERNEL_BYTE);
 
   core_path = grub_util_get_path (dir, core_file);
   core_size = grub_util_get_image_size (core_path);
@@ -350,7 +350,7 @@ setup (const char *prefix, const char *dir,
   free (core_path);
   free (tmp_img);
 
-  *kernel_sector = grub_cpu_to_be64 (first_sector);
+  *kernel_byte = grub_cpu_to_be64 (first_sector << GRUB_DISK_SECTOR_BITS);
 
   grub_util_info ("boot device path %s, prefix is %s, dest is %s",
 		  boot_devpath, prefix, dest);

From 7428eb2cf6b0b7e5edf250713ae4d8ee65ca598d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 20:38:40 +0200
Subject: [PATCH 5/6] Revert useless and wrong parts

---
 conf/powerpc-ieee1275.rmk          | 7 -------
 util/sparc64/ieee1275/grub-setup.c | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d7d477327..d5968ac8e 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -25,13 +25,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
-# Utilities.
-sbin_UTILITIES = grub-ofpathname
-
-# For grub-ofpathname.
-grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
-	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
-
 # Scripts.
 sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 34a006d7f..b511a96b2 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -441,6 +441,7 @@ init_info (struct grub_setup_info *gp)
   gp->dev_map = NULL;
   gp->root_dev = NULL;
   gp->prefix = NULL;
+  gp->dest_dev = NULL;
 }
 
 static int

From a6a6609cfc7bc1d605cd16cd36800f5d905a5e22 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 20:38:59 +0200
Subject: [PATCH 6/6] ChangeLog

---
 ChangeLog.sparcfixes | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 ChangeLog.sparcfixes

diff --git a/ChangeLog.sparcfixes b/ChangeLog.sparcfixes
new file mode 100644
index 000000000..3e7bcbaf9
--- /dev/null
+++ b/ChangeLog.sparcfixes
@@ -0,0 +1,19 @@
+2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* boot/sparc64/ieee1275/boot.S: Various size-reducing changes.
+	Retrieve chosen/bootpath if bootpath isn't hardcoded.
+	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Add
+	util/ieee1275/ofpath.c.
+	* util/sparc64/ieee1275/grub-ofpathname.c: Renamed to ...
+	* util/ieee1275/grub-ofpathname.c: ... this. All users updated
+	* include/grub/sparc64/ieee1275/boot.h
+	(GRUB_BOOT_MACHINE_KERNEL_SECTOR): Renamed to ...
+	(GRUB_BOOT_MACHINE_KERNEL_BYTE): ...this. Moved 8 bytes lower.
+	* util/hostdisk.c (grub_util_biosdisk_get_osdev): New function.
+	* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath): Make argument
+	const char *.
+	* util/sparc64/ieee1275/grub-setup.c (compute_dest_ofpath): Removed.
+	(setup): Use KERNEL_BYTE instead of KERNEL_SECTOR.
+	Use grub_util_devname_to_ofpath. Zero-fill boot_devpath on same disk
+	install.
+