diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-01-10 20:40:14 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2018-01-30 09:29:07 +0300 |
| commit | 378960d8c2c72c5b6be2a6cd7787cab8c3ba5abc (patch) | |
| tree | 5b407110626cadb5a861d3ca5d9435ccf292157f /arch | |
| parent | 7b36dbdec725d507e4af64eb06a166be82e51324 (diff) | |
| download | u-boot-378960d8c2c72c5b6be2a6cd7787cab8c3ba5abc.tar.xz | |
x86: zImage: Move subarch assignment out of cmd_line check
The commit
20bfac0599bd ("x86: zImage: add Intel MID platforms support")
introduced an assignment of subarch field in boot parameters, though
missed the right place of doing that. It doesn't matter if we have or
not a kernel command line supplied, we just set that field. Although
guard it by protocol version which supports it.
Fixes: 20bfac0599bd ("x86: zImage: add Intel MID platforms support")
Cc: Vincent Tinelli <vincent.tinelli@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lib/zimage.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 00172dc7c1..d224db4e07 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -246,14 +246,15 @@ 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 + setup_video(&setup_base->screen_info); return 0; |