smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch: x86: lib: Add support of legacy 64-bit entry point at 0x200

Browse Source 
Support of legacy 64-bit entry point was already present when booting a bzimage
with 'zboot' but not supported with 'bootm' when the x86_64 Linux kernel is
embedded in a FIT image.

Signed-off-by: Paul HENRYS <paul.henrys_ext@softathome.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
(cherry picked from commit 37f0c32ca2)
This commit is contained in:
Paul HENRYS
2024-11-20 11:39:43 +01:00
committed by Simon Glass
parent 22e96e95d2
commit 939ac3eac7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/lib/bootm.c
View File

@@ -202,6 +202,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;

1
arch/x86/lib/zimage.c
View File

@@ -425,7 +425,6 @@ int zboot_go(struct bootm_info *bmi)
image_64bit = false;
if (IS_ENABLED(CONFIG_X86_64) &&
(hdr->xloadflags & XLF_KERNEL_64)) {
entry += 0x200;
image_64bit = true;
}