aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng2018-08-23 21:28:58 -0700
committerBin Meng2018-08-30 11:23:15 +0800
commite69cc6bc42c37598e2fdda421360be6cbc0470fd (patch)
treefaf0b2bf48357077da5c5cd3cde2b66d7ea508da
parenta0913cdf7b7ef1a9f622294cf7a9e97ea9eb72f2 (diff)
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 3469bf427454 ("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>
-rw-r--r--arch/x86/include/asm/bootparam.h1
-rw-r--r--arch/x86/lib/zimage.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 0386cbeca50..dfbd4b4bbac 100644
--- 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 0442fda7606..230b38e9384 100644
--- 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);