x86: zimage: Remove acpi_rsdp_addr propagation to kernel boot parameters

As of today, the proposal of adding "acpi_rsdp_addr" to the kernel
boot protocol does not make its way to the kernel mainline. This
creates some confusion if we leave it in the U-Boot code base.
Remove it for now until we have a clear picture with kernel upstream.

Note this eventually does a partial revert to commit 941d69ade7cf
("x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters")

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 0386cbeca508f0d421e0fdef6463cf037ea88d7f..dfbd4b4bbac2834d9fb48a209dc0a99da116b240 100644 (file)
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
@@ -69,7 +69,6 @@ struct setup_header {
        __u64   pref_address;
        __u32   init_size;
        __u32   handover_offset;
-       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 0442fda760652a2e57ff1aea027a979d319442ec..230b38e9384f41782a11d7c47fa305d66b3f8068 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -287,11 +287,6 @@ 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);