diff options
| author | Simon Glass <sjg@chromium.org> | 2014-10-10 08:21:57 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-10-28 20:44:04 -0600 |
| commit | 5bda35cffafe4955bbbae820dd17cb6e3cbca8d8 (patch) | |
| tree | ee1846a1036f4eea67ec561fe6ef3f18f11e82b8 | |
| parent | 76539383ea0288985dc6216a92e3d7961df958b3 (diff) | |
| download | u-boot-imx-5bda35cffafe4955bbbae820dd17cb6e3cbca8d8.zip u-boot-imx-5bda35cffafe4955bbbae820dd17cb6e3cbca8d8.tar.gz u-boot-imx-5bda35cffafe4955bbbae820dd17cb6e3cbca8d8.tar.bz2 | |
x86: image: Add new image type for x64_64
This is a bit odd in that we are permitted to boot images for either, even
though they are separate architectures.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/bootm.c | 3 | ||||
| -rw-r--r-- | common/image-fit.c | 3 | ||||
| -rw-r--r-- | common/image.c | 1 | ||||
| -rw-r--r-- | include/image.h | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c index 81e3261..6b3ea8c 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 a272ea2..4ffc5aa 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 eb92e63..b75a5ce 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, "", "", }, }; diff --git a/include/image.h b/include/image.h index a13a302..07e9aed 100644 --- a/include/image.h +++ b/include/image.h @@ -173,6 +173,7 @@ struct lmb; #define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */ #define IH_ARCH_ARM64 22 /* ARM64 */ #define IH_ARCH_ARC 23 /* Synopsys DesignWare ARC */ +#define IH_ARCH_X86_64 24 /* AMD x86_64, Intel and Via */ /* * Image Types |