From: Jeremy Compostella Date: Tue, 18 Mar 2025 17:40:34 +0000 (-0700) Subject: arch/x86/lib: Fix CONFIG_X86_64 usage in zimage.c X-Git-Tag: v2025.07-rc1~119^2~5^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eefb60e89b8c7c4a14750fee0f6bd7cf1fcc4f9;p=pandora-u-boot.git 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 Reviewed-by: Simon Glass --- 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; }