x86: Add a common HOB library

[oweals/u-boot.git] / arch / x86 / lib / zimage.c

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 9932ee69a0c42a1672acb8ce955bc5543428ba10..230b38e9384f41782a11d7c47fa305d66b3f8068 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -288,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;
 }