Merge git://git.denx.de/u-boot-x86

This commit is contained in:
Tom Rini 2015-09-29 13:14:21 -04:00
commit 4af90a6d03
2 changed files with 3 additions and 1 deletions

View file

@ -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 */

View file

@ -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