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 | |
| parent | b8be4e365c6f7b5351037bba5d400ace9363fa0a (diff) | |
| parent | 026090e4c51e00841b04abf58f48cc3a45654bc4 (diff) | |
| download | blackbird-obmc-uboot-2c54cb5516238ae93c930dee7f8e353291f2cdfb.tar.gz blackbird-obmc-uboot-2c54cb5516238ae93c930dee7f8e353291f2cdfb.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 3 | ||||
| -rw-r--r-- | common/image-fit.c | 3 | ||||
| -rw-r--r-- | common/image.c | 1 |
3 files changed, 5 insertions, 2 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); diff --git a/common/image-fit.c b/common/image-fit.c index a272ea2e83..4ffc5aaa51 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1114,7 +1114,8 @@ int fit_image_check_arch(const void *fit, int noffset, uint8_t arch) if (fit_image_get_arch(fit, noffset, &image_arch)) return 0; - return (arch == image_arch); + return (arch == image_arch) || + (arch == IH_ARCH_I386 && image_arch == IH_ARCH_X86_64); } /** diff --git a/common/image.c b/common/image.c index eb92e6323c..b75a5ce29a 100644 --- a/common/image.c +++ b/common/image.c @@ -85,6 +85,7 @@ static const table_entry_t uimage_arch[] = { { IH_ARCH_SANDBOX, "sandbox", "Sandbox", }, { IH_ARCH_ARM64, "arm64", "AArch64", }, { IH_ARCH_ARC, "arc", "ARC", }, + { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, { -1, "", "", }, }; |
