diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index d906436a8c..14f542aa69 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -50,6 +50,13 @@ config ARCH_RAMSTAGE_X86_64
 	bool
 	select ARCH_X86
 
+config ARCH_ALL_STAGES_X86_64
+	bool
+	select ARCH_BOOTBLOCK_X86_64
+	select ARCH_VERSTAGE_X86_64
+	select ARCH_ROMSTAGE_X86_64
+	select ARCH_RAMSTAGE_X86_64
+
 if ARCH_X86
 
 config ARCH_X86_64_PGTBL_LOC
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index af0c746f10..e72fbc308d 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -12,11 +12,8 @@ if CPU_QEMU_X86
 
 config CPU_QEMU_X86_64
 	bool "Experimental 64bit support"
-	select ARCH_BOOTBLOCK_X86_64
-	select ARCH_VERSTAGE_X86_64
-	select ARCH_ROMSTAGE_X86_64
+	select ARCH_ALL_STAGES_X86_64
 	select ARCH_POSTCAR_X86_64
-	select ARCH_RAMSTAGE_X86_64
 
 config CPU_QEMU_X86_32
 	bool