aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/lib/zimage.c')
-rw-r--r--arch/x86/lib/zimage.c9
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,
287 hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; 287 hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
288#endif 288#endif
289 289
290#ifdef CONFIG_GENERATE_ACPI_TABLE
291 if (bootproto >= 0x020e)
292 hdr->acpi_rsdp_addr = acpi_get_rsdp_addr();
293#endif
294
295 setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0)); 290 setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
296 setup_video(&setup_base->screen_info); 291 setup_video(&setup_base->screen_info);
297 292
293#ifdef CONFIG_EFI_STUB
294 setup_efi_info(&setup_base->efi_info);
295#endif
296
298 return 0; 297 return 0;
299} 298}
300 299