diff options
| author | Tom Rini <trini@ti.com> | 2014-10-29 15:57:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-29 15:57:59 -0400 |
| commit | 2c54cb5516238ae93c930dee7f8e353291f2cdfb (patch) | |
| tree | 17a1322a88f7381964bb1c89f8ed4b15472bbd3d /common/bootm.c | |
| parent | b8be4e365c6f7b5351037bba5d400ace9363fa0a (diff) | |
| parent | 026090e4c51e00841b04abf58f48cc3a45654bc4 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'common/bootm.c')
| -rw-r--r-- | common/bootm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/bootm.c b/common/bootm.c index 81e32617c3..6b3ea8c61b 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -167,7 +167,8 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc, } /* If we have a valid setup.bin, we will use that for entry (x86) */ - if (images.os.arch == IH_ARCH_I386) { + if (images.os.arch == IH_ARCH_I386 || + images.os.arch == IH_ARCH_X86_64) { ulong len; ret = boot_get_setup(&images, IH_ARCH_I386, &images.ep, &len); |