vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't abort() on unavailable coreboot tables if not running on coreboot.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-28 17:25:14 +01:00
parent 989af02582
commit 093dec7370
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-28 Vladimir Serbinenko <phcoder@gmail.com>
Don't abort() on unavailable coreboot tables if not running on coreboot.
2013-12-28 Andrey Borzenkov <arvidjaar@gmail.com> 2013-12-28 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/kern/emu/misc.c: Remove unused error.h; fixes compilation * grub-core/kern/emu/misc.c: Remove unused error.h; fixes compilation

2
grub-core/kern/i386/coreboot/cbtable.c
View file

@ -55,7 +55,7 @@ grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
if (check_signature (table_header)) if (check_signature (table_header))
goto signature_found; goto signature_found;
grub_fatal ("Could not find coreboot table\n"); return 0;
signature_found: signature_found:

5
grub-core/kern/i386/coreboot/init.c
View file

@ -51,6 +51,7 @@ grub_exit (void)
grub_addr_t grub_modbase = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR; grub_addr_t grub_modbase = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
static grub_uint64_t modend; static grub_uint64_t modend;
static int have_memory = 0;
/* Helper for grub_machine_init. */ /* Helper for grub_machine_init. */
static int 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)); grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) (end - begin));
have_memory = 1;
return 0; return 0;
} }
@ -97,6 +100,8 @@ grub_machine_init (void)
grub_vga_text_init (); grub_vga_text_init ();
grub_machine_mmap_iterate (heap_init, NULL); grub_machine_mmap_iterate (heap_init, NULL);
if (!have_memory)
grub_fatal ("No memory found");
grub_video_coreboot_fb_late_init (); grub_video_coreboot_fb_late_init ();