mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
Don't abort() on unavailable coreboot tables if not running on coreboot.
This commit is contained in:
1 parent
989af02582
commit
093dec7370
3 files changed
+10
-1
No files matched your search
@@ -55,7 +55,7 @@ grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
|
||||
if (check_signature (table_header))
|
||||
goto signature_found;
|
||||
|
||||
grub_fatal ("Could not find coreboot table\n");
|
||||
return 0;
|
||||
|
||||
signature_found:
|
||||
|
||||
|
||||
@@ -51,6 +51,7 @@ grub_exit (void)
|
||||
|
||||
grub_addr_t grub_modbase = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
|
||||
static grub_uint64_t modend;
|
||||
static int have_memory = 0;
|
||||
|
||||
/* Helper for grub_machine_init. */
|
||||
static int
|
||||
@@ -82,6 +83,8 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
|
||||
|
||||
grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) (end - begin));
|
||||
|
||||
have_memory = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -97,6 +100,8 @@ grub_machine_init (void)
|
||||
grub_vga_text_init ();
|
||||
|
||||
grub_machine_mmap_iterate (heap_init, NULL);
|
||||
if (!have_memory)
|
||||
grub_fatal ("No memory found");
|
||||
|
||||
grub_video_coreboot_fb_late_init ();
|
||||
|
||||
|
||||
Reference in new issue
Block a user