summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-10 08:21:58 -0600
committerSimon Glass <sjg@chromium.org>2014-10-28 20:44:12 -0600
commit61643ae61a8da145445778660042409903018506 (patch)
tree67c07bb286d10ce173c66142443309bac1edaa7a /arch/x86
parent5bda35cffafe4955bbbae820dd17cb6e3cbca8d8 (diff)
downloadu-boot-imx-61643ae61a8da145445778660042409903018506.zip
u-boot-imx-61643ae61a8da145445778660042409903018506.tar.gz
u-boot-imx-61643ae61a8da145445778660042409903018506.tar.bz2
x86: bootm: Support booting a 64-bit raw kernel
Detect an x86_64 kernel and boot it in 64-bit mode. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/bootm.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index b90ca65..46a1d96 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -15,6 +15,7 @@
#include <image.h>
#include <u-boot/zlib.h>
#include <asm/bootparam.h>
+#include <asm/cpu.h>
#include <asm/byteorder.h>
#include <asm/zimage.h>
#ifdef CONFIG_SYS_COREBOOT
@@ -148,7 +149,11 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
timestamp_add_now(TS_U_BOOT_START_KERNEL);
#endif
if (image_64bit) {
- /* TODO(boot 64-bit kernel) */
+ if (!cpu_has_64bit()) {
+ puts("Cannot boot 64-bit kernel on 32-bit machine\n");
+ return -EFAULT;
+ }
+ return cpu_jump_to_64bit(setup_base, load_address);
} else {
/*
* Set %ebx, %ebp, and %edi to 0, %esi to point to the
@@ -178,7 +183,8 @@ static int boot_jump_linux(bootm_headers_t *images)
debug("## Transferring control to Linux (at address %08lx, kernel %08lx) ...\n",
images->ep, images->os.load);
- return boot_linux_kernel(images->ep, images->os.load, false);
+ return boot_linux_kernel(images->ep, images->os.load,
+ images->os.arch == IH_ARCH_X86_64);
}
int do_bootm_linux(int flag, int argc, char * const argv[],