Enable coreboot information commands even when not loaded as

coreboot payload (e.g. when loaded from SeaBIOS-as-payload).

ChangeLog

@@ -1,3 +1,8 @@
+2013-06-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Enable coreboot information commands even when not loaded as
+	coreboot payload (e.g. when loaded from SeaBIOS-as-payload).
+
 2013-06-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Support for cbfs. Also factor out the part which is common

grub-core/Makefile.core.def

@@ -170,6 +170,7 @@ kernel = {
   i386_qemu = kern/i386/qemu/mmap.c;
 
   i386_coreboot = kern/i386/coreboot/mmap.c;
+  i386_coreboot = kern/i386/coreboot/cbtable.c;
 
   i386_multiboot = kern/i386/multiboot_mmap.c;
 
@@ -558,22 +559,33 @@ module = {
   enable = x86;
 };
 
+module = {
+  name = cbtable;
+  common = kern/i386/coreboot/cbtable.c;
+  enable = i386_pc;
+  enable = i386_efi;
+  enable = i386_qemu;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
+  enable = x86_64_efi;
+};
+
 module = {
   name = cbtime;
   common = commands/i386/coreboot/cb_timestamps.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {
   name = cbls;
   common = commands/i386/coreboot/cbls.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {
   name = cbmemc;
   common = term/i386/coreboot/cbmemc.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {

grub-core/kern/i386/coreboot/cbtable.c

@@ -0,0 +1,83 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007,2008,2013  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 <grub/i386/coreboot/memory.h>
+#include <grub/i386/coreboot/lbio.h>
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+/* Helper for grub_linuxbios_table_iterate.  */
+static int
+check_signature (grub_linuxbios_table_header_t tbl_header)
+{
+  if (! grub_memcmp (tbl_header->signature, "LBIO", 4))
+    return 1;
+
+  return 0;
+}
+
+grub_err_t
+grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
+					   void *),
+			      void *hook_data)
+{
+  grub_linuxbios_table_header_t table_header;
+  grub_linuxbios_table_item_t table_item;
+
+  /* Assuming table_header is aligned to its size (8 bytes).  */
+
+  for (table_header = (grub_linuxbios_table_header_t) 0x500;
+       table_header < (grub_linuxbios_table_header_t) 0x1000; table_header++)
+    if (check_signature (table_header))
+      goto signature_found;
+
+  for (table_header = (grub_linuxbios_table_header_t) 0xf0000;
+       table_header < (grub_linuxbios_table_header_t) 0x100000; table_header++)
+    if (check_signature (table_header))
+      goto signature_found;
+
+  grub_fatal ("Could not find coreboot table\n");
+
+signature_found:
+
+  table_item =
+    (grub_linuxbios_table_item_t) ((long) table_header +
+			       (long) table_header->header_size);
+  for (; table_item < (grub_linuxbios_table_item_t) ((long) table_header
+						     + (long) table_header->header_size
+						     + (long) table_header->table_size);
+       table_item = (grub_linuxbios_table_item_t) ((long) table_item + (long) table_item->size))
+    {
+      if (table_item->tag == GRUB_LINUXBIOS_MEMBER_LINK
+         && check_signature ((grub_linuxbios_table_header_t) (grub_addr_t)
+                             *(grub_uint64_t *) (table_item + 1)))
+       {
+         table_header = (grub_linuxbios_table_header_t) (grub_addr_t)
+           *(grub_uint64_t *) (table_item + 1);
+         goto signature_found;   
+       }
+      if (hook (table_item, hook_data))
+       return 1;
+    }
+
+  return 0;
+}

grub-core/kern/i386/coreboot/mmap.c

@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2007,2008,2013  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
@@ -22,63 +22,6 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 
-/* Helper for grub_linuxbios_table_iterate.  */
-static int
-check_signature (grub_linuxbios_table_header_t tbl_header)
-{
-  if (! grub_memcmp (tbl_header->signature, "LBIO", 4))
-    return 1;
-
-  return 0;
-}
-
-grub_err_t
-grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
-					   void *),
-			      void *hook_data)
-{
-  grub_linuxbios_table_header_t table_header;
-  grub_linuxbios_table_item_t table_item;
-
-  /* Assuming table_header is aligned to its size (8 bytes).  */
-
-  for (table_header = (grub_linuxbios_table_header_t) 0x500;
-       table_header < (grub_linuxbios_table_header_t) 0x1000; table_header++)
-    if (check_signature (table_header))
-      goto signature_found;
-
-  for (table_header = (grub_linuxbios_table_header_t) 0xf0000;
-       table_header < (grub_linuxbios_table_header_t) 0x100000; table_header++)
-    if (check_signature (table_header))
-      goto signature_found;
-
-  grub_fatal ("Could not find coreboot table\n");
-
-signature_found:
-
-  table_item =
-    (grub_linuxbios_table_item_t) ((long) table_header +
-			       (long) table_header->header_size);
-  for (; table_item < (grub_linuxbios_table_item_t) ((long) table_header
-						     + (long) table_header->header_size
-						     + (long) table_header->table_size);
-       table_item = (grub_linuxbios_table_item_t) ((long) table_item + (long) table_item->size))
-    {
-      if (table_item->tag == GRUB_LINUXBIOS_MEMBER_LINK
-         && check_signature ((grub_linuxbios_table_header_t) (grub_addr_t)
-                             *(grub_uint64_t *) (table_item + 1)))
-       {
-         table_header = (grub_linuxbios_table_header_t) (grub_addr_t)
-           *(grub_uint64_t *) (table_item + 1);
-         goto signature_found;   
-       }
-      if (hook (table_item, hook_data))
-       return 1;
-    }
-
-  return 0;
-}
-
 /* Context for grub_machine_mmap_iterate.  */
 struct grub_machine_mmap_iterate_ctx
 {

grub-core/term/i386/coreboot/cbmemc.c

@@ -23,7 +23,7 @@
 #include <grub/time.h>
 #include <grub/terminfo.h>
 #include <grub/dl.h>
-#include <grub/machine/lbio.h>
+#include <grub/i386/coreboot/lbio.h>
 #include <grub/command.h>
 #include <grub/normal.h>