Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e69cc6bc42c37598e2fdda421360be6cbc0470fd

Authored by Bin Meng
1 parent a0913cdf7b

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>

Showing 2 changed files with 0 additions and 6 deletions Side-by-side Diff

arch/x86/include/asm/bootparam.h
Diff comments   View file @ e69cc6b
... ... @@ -69,7 +69,6 @@
69 69 __u64 pref_address;
70 70 __u32 init_size;
71 71 __u32 handover_offset;
72   - __u64 acpi_rsdp_addr;
73 72 } __attribute__((packed));
74 73  
75 74 struct sys_desc_table {
arch/x86/lib/zimage.c
Diff comments   View file @ e69cc6b
... ... @@ -287,11 +287,6 @@
287 287 hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
288 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 290 setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
296 291 setup_video(&setup_base->screen_info);
297 292