* grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to

	EFI system table.

diff --git a/ChangeLog b/ChangeLog
index 1dba603ca93533a43a452cbf7e9154e92692e163..ee46a4dfa9984374047356ec95234bbefd140bab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21  Stephane Rochoy <sheda>
+
+       * grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to
+       EFI system table.
+
 2014-06-21  Stephane Rochoy <sheda>
 
        * grub-core/commands/efi/lsefisystab.c (grub_cmd_lsefisystab): Show

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 41ef9109ee12dd59b7ae5a182884ede6cb2a8999..8f691e0e2d19b465130ae04b963865f1d2a1ea0a 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1145,6 +1145,14 @@ grub_netbsd_boot (void)
   if (err)
     return err;
 
+#ifdef GRUB_MACHINE_EFI
+  err = grub_bsd_add_meta (NETBSD_BTINFO_EFI,
+                          &grub_efi_system_table,
+                          sizeof (grub_efi_system_table));
+  if (err)
+    return err;
+#endif
+
   {
     struct bsd_tag *tag;
     tag_buf_len = 0;

diff --git a/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
index e48c19b408997d06c3cb71d8464c9e63bce514ef..9b4f460410337bb45a06b4454a348d2820c86cbe 100644 (file)
--- a/include/grub/i386/netbsd_bootinfo.h
+++ b/include/grub/i386/netbsd_bootinfo.h
@@ -58,6 +58,8 @@
 #define NETBSD_BTINFO_BOOTWEDGE                10
 #define NETBSD_BTINFO_MODULES          11
 #define NETBSD_BTINFO_FRAMEBUF         12
+#define NETBSD_BTINFO_USERCONFCOMMANDS  13
+#define NETBSD_BTINFO_EFI              14
 
 struct grub_netbsd_bootinfo
 {
@@ -146,4 +148,9 @@ struct grub_netbsd_btinfo_framebuf
 
 #define GRUB_NETBSD_MAX_ROOTDEVICE_LEN 16
 
+struct grub_netbsd_btinfo_efi
+{
+  void *pa_systbl;  /* Physical address of the EFI System Table */
+};
+
 #endif