On Thu, 2018-08-23 at 21:28 -0700, Bin Meng wrote: > 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") >
Acked-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> > Signed-off-by: Bin Meng <bmeng...@gmail.com> > --- > > arch/x86/include/asm/bootparam.h | 1 - > arch/x86/lib/zimage.c | 5 ----- > 2 files changed, 6 deletions(-) > > diff --git a/arch/x86/include/asm/bootparam.h > b/arch/x86/include/asm/bootparam.h > index 0386cbe..dfbd4b4 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 0442fda..230b38e 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); > -- Andy Shevchenko <andriy.shevche...@linux.intel.com> Intel Finland Oy _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot