Merge branch 'master' into arm_coreboot

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

@@ -27,48 +27,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 #pragma GCC diagnostic ignored "-Wcast-align"
 
-/* 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
+grub_linuxbios_get_tables (void)
 {
   grub_linuxbios_table_header_t table_header
     = (grub_linuxbios_table_header_t) grub_arm_saved_registers.r[0];
-  grub_linuxbios_table_item_t table_item;
 
-  if (!check_signature (table_header))
+  if (!grub_linuxbios_check_signature (table_header))
     return 0;
 
- signature_found:
-  table_item =
-    (grub_linuxbios_table_item_t) ((char *) table_header +
-				   table_header->header_size);
-  for (; table_item < (grub_linuxbios_table_item_t) ((char *) table_header
-						     + table_header->header_size
-						     + table_header->table_size);
-       table_item = (grub_linuxbios_table_item_t) ((char *) table_item + 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;
+  return table_header;
 }

grub-core/kern/arm/coreboot/init.c

@@ -155,6 +155,7 @@ grub_machine_init (void)
   grub_machine_timer_init ();
   grub_cros_init ();
   grub_pl050_init ();
+  grub_machine_timer_init ();
 }
 
 void