diff options
| author | Jeremy Compostella <jeremy.compostella@intel.com> | 2025-03-18 10:40:34 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-04 12:26:36 -0600 |
| commit | 8eefb60e89b8c7c4a14750fee0f6bd7cf1fcc4f9 (patch) | |
| tree | 18f2560db58d444c6024d0bdfea5b6f94e67beef | |
| parent | e4246c1521c4b7bb1e3bece5c921f4c7e6a85e60 (diff) | |
arch/x86/lib: Fix CONFIG_X86_64 usage in zimage.c
Correct the preprocessor directive used to check for 64-bit kernel
support in the `zboot_go` function. The code previously checked for
`CONFIG_X86_RUN_64BIT`, which is not the correct configuration option
for determining if the kernel should run in 64-bit mode. The correct
option is `CONFIG_X86_64`.
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/lib/zimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 65bccdae9b2..8f1c18eaadc 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -423,7 +423,7 @@ int zboot_go(struct bootm_info *bmi) entry = bmi->load_address; image_64bit = false; - if (IS_ENABLED(CONFIG_X86_RUN_64BIT) && + if (IS_ENABLED(CONFIG_X86_64) && (hdr->xloadflags & XLF_KERNEL_64)) { image_64bit = true; } |