diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:11 -0400 |
| commit | 284d201b4d9c17bc92044f825ce44550d66841cd (patch) | |
| tree | faf0b2bf48357077da5c5cd3cde2b66d7ea508da /arch/x86/lib/zimage.c | |
| parent | 11ed312896c5f5814064c5d45dcb2f53dc121437 (diff) | |
| parent | e69cc6bc42c37598e2fdda421360be6cbc0470fd (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 04ed972482..230b38e938 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -287,14 +287,13 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; #endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - if (bootproto >= 0x020e) - hdr->acpi_rsdp_addr = acpi_get_rsdp_addr(); -#endif - setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0)); setup_video(&setup_base->screen_info); +#ifdef CONFIG_EFI_STUB + setup_efi_info(&setup_base->efi_info); +#endif + return 0; } |