diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-01 16:31:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-01 16:31:11 -0400 |
| commit | f2d2d2247132a1fa033a40ae89afed8dc5ebc1e1 (patch) | |
| tree | d7d89e0ca39716d728e3a89618d0c6892752600b /arch/x86/lib/zimage.c | |
| parent | 023ff4b88dcec5faa3f9b841bae4d3d232b58ce2 (diff) | |
| parent | d905aa8a4277e200e11fdf6d73a7c76d0e6f34a4 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Propagate acpi_rsdp_addr to x86 kernel via boot parameters
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 6a6258a5057..d07041fd4ce 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -288,6 +288,10 @@ 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 + setup_base->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); |