diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
| commit | 3bfd12008bef1a8353e7ceaca2cb06cf388527ed (patch) | |
| tree | ac25e8db2f18bcba9f48518249fc020a05cb576c /arch/x86/lib | |
| parent | 6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72 (diff) | |
| parent | d6da3dbaef57fc1d319b6b552efa009e2489d7d9 (diff) | |
Merge branch 'next'
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/bootm.c | 6 | ||||
| -rw-r--r-- | arch/x86/lib/zimage.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 0f79a5d5495..0cf3824d203 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -189,6 +189,12 @@ int boot_linux_kernel(ulong setup_base, ulong entry, bool image_64bit) if (CONFIG_IS_ENABLED(X86_64)) { typedef void (*h_func)(ulong zero, ulong setup); h_func func; + struct setup_header *hdr = &(((struct boot_params *)(setup_base))->hdr); + + /* Handle kernel with legacy 64-bit entry point at 0x200 */ + if (hdr->xloadflags & XLF_KERNEL_64) { + entry += 0x200; + } /* jump to Linux with rdi=0, rsi=setup_base */ func = (h_func)entry; diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 73a21bc8f03..2eece34a073 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -426,7 +426,6 @@ int zboot_go(void) image_64bit = false; if (IS_ENABLED(CONFIG_X86_RUN_64BIT) && (hdr->xloadflags & XLF_KERNEL_64)) { - entry += 0x200; image_64bit = true; } |