[Concept,05/12] x86: Exclude X86_32BIT_INIT for 64-bit builds

Message ID 20260211143309.1183113-6-sjg@u-boot.org
State New
Headers
Series x86: Add single 64-bit U-Boot without SPL for QEMU |

Commit Message

Simon Glass Feb. 11, 2026, 2:32 p.m. UTC
  From: Simon Glass <simon.glass@canonical.com>

X86_32BIT_INIT is currently selected whenever X86_RESET_VECTOR
is set and SPL is not used. This is wrong for 64-bit builds
without SPL, which handle the 32-bit-to-64-bit transition in
their own startup code rather than using the 32-bit init path.

Add !X86_64 to the default condition so that 64-bit builds are
excluded.

Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Patch

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a7d616a401d..db3f16a7222 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -208,7 +208,7 @@  config TPL_X86_16BIT_INIT
 config X86_32BIT_INIT
 	bool
 	depends on X86_RESET_VECTOR
-	default y if X86_RESET_VECTOR && !SPL
+	default y if X86_RESET_VECTOR && !SPL && !X86_64
 	help
 	  This is enabled when 32-bit init is in U-Boot proper