diff options
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 00172dc7c1..2a82bc83d6 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <asm/acpi_table.h> #include <asm/io.h> #include <asm/ptrace.h> #include <asm/zimage.h> @@ -246,14 +247,20 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, hdr->setup_move_size = 0x9100; } -#if defined(CONFIG_INTEL_MID) - hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; -#endif - /* build command line at COMMAND_LINE_OFFSET */ build_command_line(cmd_line, auto_boot); } +#ifdef CONFIG_INTEL_MID + if (bootproto >= 0x0207) + 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_video(&setup_base->screen_info); return 0; |