* grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low

	tables for low memory calculations.

diff --git a/ChangeLog b/ChangeLog
index feea17861da262c64fc9d4d9d176393831650602..5edbf6728fcb48ef8d93a63ef8873ec3f0d7fe3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low
+       tables for low memory calculations.
+
 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi): Limit

diff --git a/grub-core/mmap/i386/uppermem.c b/grub-core/mmap/i386/uppermem.c
index bd8b429c4be8e77b013131177e063d97335f81a7..a6be9896d82930b9371ac358912ec56df1bf3f3b 100644 (file)
--- a/grub-core/mmap/i386/uppermem.c
+++ b/grub-core/mmap/i386/uppermem.c
@@ -31,8 +31,12 @@ lower_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
 
   if (type != GRUB_MEMORY_AVAILABLE)
     return 0;
+#ifdef GRUB_MACHINE_COREBOOT
+  if (addr <= 0x1000)
+#else
   if (addr == 0)
-    *lower = size;
+#endif
+    *lower = size + addr;
   return 0;
 }