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

Replace the region at 0 from coreboot tables to available in BSD

Browse source 
memory map.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-25 10:23:04 +01:00
parent ff99babdfe
commit 6a7fb94bfb
6 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
grub-core/loader/i386/bsd.c
View file

@ -268,6 +268,7 @@ struct grub_e820_mmap
#define GRUB_E820_ACPI 3
#define GRUB_E820_NVS 4
#define GRUB_E820_BADRAM 5
#define GRUB_E820_COREBOOT_TABLES 0x10
/* Context for generate_e820_mmap. */
struct generate_e820_mmap_ctx
@ -299,13 +300,21 @@ generate_e820_mmap_iter (grub_uint64_t addr, grub_uint64_t size,
case GRUB_MEMORY_NVS:
ctx->cur.type = GRUB_E820_NVS;
break;
case GRUB_MEMORY_COREBOOT_TABLES:
/* Nowadays the tables at 0 don't contain anything important but
*BSD needs the memory at 0 for own needs.
*/
if (addr == 0)
ctx->cur.type = GRUB_E820_RAM;
else
ctx->cur.type = GRUB_E820_COREBOOT_TABLES;
break;
default:
case GRUB_MEMORY_CODE:
case GRUB_MEMORY_RESERVED:
ctx->cur.type = GRUB_E820_RESERVED;
break;
}
}
/* Merge regions if possible. */
if (ctx->count && ctx->cur.type == ctx->prev.type