summaryrefslogtreecommitdiff
path: root/common/bootm.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-10 08:21:57 -0600
committerSimon Glass <sjg@chromium.org>2014-10-28 20:44:04 -0600
commit5bda35cffafe4955bbbae820dd17cb6e3cbca8d8 (patch)
treeee1846a1036f4eea67ec561fe6ef3f18f11e82b8 /common/bootm.c
parent76539383ea0288985dc6216a92e3d7961df958b3 (diff)
downloadu-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>
Diffstat (limited to 'common/bootm.c')
-rw-r--r--common/bootm.c3
1 files changed, 2 insertions, 1 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);