summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-08-13 00:29:09 -0700
committerSimon Glass <sjg@chromium.org>2015-08-26 07:54:07 -0700
commit52b778603b7017885d67428c9cca9807bc6e2f7d (patch)
treebc6b575302cb368eca3d4b47b4d852a559710313 /arch/x86
parent89b870814c03777c3a8d3f2e3ed761479a9f1456 (diff)
downloadu-boot-imx-52b778603b7017885d67428c9cca9807bc6e2f7d.zip
u-boot-imx-52b778603b7017885d67428c9cca9807bc6e2f7d.tar.gz
u-boot-imx-52b778603b7017885d67428c9cca9807bc6e2f7d.tar.bz2
x86: coreboot: Correctly report E820 types
coreboot has some extensions (type 6 & 16) to the E820 types. When we detect this, mark it as E820_RESERVED. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/coreboot/sdram.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 9c3ab81..2722886 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -22,9 +22,10 @@ DECLARE_GLOBAL_DATA_PTR;
unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
{
+ unsigned num_entries;
int i;
- unsigned num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries);
+ num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries);
if (num_entries < lib_sysinfo.n_memranges) {
printf("Warning: Limiting e820 map to %d entries.\n",
num_entries);
@@ -34,8 +35,18 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
entries[i].addr = memrange->base;
entries[i].size = memrange->size;
- entries[i].type = memrange->type;
+
+ /*
+ * coreboot has some extensions (type 6 & 16) to the E820 types.
+ * When we detect this, mark it as E820_RESERVED.
+ */
+ if (memrange->type == CB_MEM_VENDOR_RSVD ||
+ memrange->type == CB_MEM_TABLE)
+ entries[i].type = E820_RESERVED;
+ else
+ entries[i].type = memrange->type;
}
+
return num_entries;
}