diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-15 11:06:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-15 11:06:24 -0400 |
| commit | d3fc3da9a4fb98104d004b025149ec6dadccc2cd (patch) | |
| tree | dfe357a19bc480ea1bd5c9732bc82b3c7441790c /arch/x86/lib/zimage.c | |
| parent | 18e7ebf7555203e26066c6264b2275c34e03632d (diff) | |
| parent | 2f91fc40039d2ef6f433d5c56c4f4701975f510f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: various improvements made in getting Chromium OS verified boot
running on top of coreboot, booting into U-Boot.
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 90fc8a466d..cf4210cd4b 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -313,12 +313,12 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, int bootproto = get_boot_protocol(hdr, false); log_debug("Setup E820 entries\n"); - if (ll_boot_init()) { - setup_base->e820_entries = install_e820_map( - ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map); - } else if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) { + if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) { setup_base->e820_entries = cb_install_e820_map( ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map); + } else { + setup_base->e820_entries = install_e820_map( + ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map); } if (bootproto == 0x0100) { |