Blame SOURCES/0328-grub-core-kern-ieee1275-cmain.c-grub_ieee1275_find_o.patch

f96e0b
From 16489277b4f51c97e8fe631dc4ea67e689e5c70b Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Fri, 19 Apr 2013 15:14:28 +0200
f96e0b
Subject: [PATCH 328/482] 	* grub-core/kern/ieee1275/cmain.c
f96e0b
 (grub_ieee1275_find_options): 	Look for /boot-rom as well as /rom/boot-rom.
f96e0b
f96e0b
---
f96e0b
 ChangeLog                       | 5 +++++
f96e0b
 grub-core/kern/ieee1275/cmain.c | 3 ++-
f96e0b
 2 files changed, 7 insertions(+), 1 deletion(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 3d4b23d..488be60 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,10 @@
f96e0b
 2013-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):
f96e0b
+	Look for /boot-rom as well as /rom/boot-rom.
f96e0b
+
f96e0b
+2013-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	* grub-core/commands/videotest.c (grub_cmd_videotest): Fix error
f96e0b
 	handling when creating text_layer failed.
f96e0b
 	* grub-core/video/video.c (grub_video_create_render_target):
f96e0b
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
f96e0b
index 5f6a6da..abd1ca9 100644
f96e0b
--- a/grub-core/kern/ieee1275/cmain.c
f96e0b
+++ b/grub-core/kern/ieee1275/cmain.c
f96e0b
@@ -186,7 +186,8 @@ grub_ieee1275_find_options (void)
f96e0b
       grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF);
f96e0b
     }
f96e0b
 
f96e0b
-  if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom))
f96e0b
+  if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom)
f96e0b
+      || ! grub_ieee1275_finddevice ("/boot-rom", &bootrom))
f96e0b
     {
f96e0b
       rc = grub_ieee1275_get_property (bootrom, "model", tmp, sizeof (tmp), 0);
f96e0b
       if (rc >= 0 && !grub_strncmp (tmp, "PPC Open Hack'Ware",
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b