diff options
| author | Simon Glass <sjg@chromium.org> | 2021-07-10 21:15:21 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2021-07-15 19:56:16 +0800 |
| commit | 2f91fc40039d2ef6f433d5c56c4f4701975f510f (patch) | |
| tree | b190ada0a662ab994fe99f46e6f4a49e7497e061 /arch/x86 | |
| parent | 4db474aea09ab75644e0c5a63c57d74226be921d (diff) | |
| download | u-boot-2f91fc40039d2ef6f433d5c56c4f4701975f510f.tar.gz u-boot-2f91fc40039d2ef6f433d5c56c4f4701975f510f.tar.bz2 u-boot-2f91fc40039d2ef6f433d5c56c4f4701975f510f.zip | |
x86: Ensure the e820 map is installed in all cases
This is a revert of a recent logic change in setup_zimage(). We do
actually need to install this information always. Change it to install
from the Coreboot tables if available, else the normal source.
Fixes: e7bae8283fe ("x86: Allow installing an e820 when booting from coreboot")
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86')
| -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) { |