diff options
| author | Tom Rini | 2015-09-29 13:14:21 -0400 |
|---|---|---|
| committer | Tom Rini | 2015-09-29 13:14:21 -0400 |
| commit | 4af90a6d033bdde93d2fe03ed884a20e9359c4e5 (patch) | |
| tree | 8faecca1a6ac8464701fa4eaefd41d002399afa8 | |
| parent | 46f166caad48ed38f6ccc0c2fc6d1828d15dacb2 (diff) | |
| parent | 196193a4d4963a8dde00c7cdd0ec83b60ea61e61 (diff) | |
Merge git://git.denx.de/u-boot-x86
| -rw-r--r-- | arch/x86/lib/fsp/fsp_dram.c | 3 | ||||
| -rw-r--r-- | configs/chromebook_link_defconfig | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 28552fa15a0..e51ca96eb71 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -72,9 +72,10 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) entries[num_entries].type = E820_RAM; else if (res_desc->type == RES_MEM_RESERVED) entries[num_entries].type = E820_RESERVED; + + num_entries++; } hdr = get_next_hob(hdr); - num_entries++; } /* Mark PCIe ECAM address range as reserved */ diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 1c10124e851..21e85f3c666 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -1,4 +1,5 @@ CONFIG_X86=y +CONFIG_SYS_MALLOC_F_LEN=0x1800 CONFIG_VENDOR_GOOGLE=y CONFIG_DEFAULT_DEVICE_TREE="chromebook_link" CONFIG_TARGET_CHROMEBOOK_LINK=y |