diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index d5c688d40f..658d2aaf74 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -1,3 +1,5 @@
+if ARCH_X86
+
 config PARALLEL_MP
 	def_bool y
 	depends on !LEGACY_SMP_INIT
@@ -194,3 +196,5 @@ config CPU_INFO_V2
 	  Enables the new method of locating struct cpu_info. This new method
 	  uses the %gs segment to locate the cpu_info pointer. The old method
 	  relied on the stack being CONFIG_STACK_SIZE aligned.
+
+endif # ARCH_X86
diff --git a/src/cpu/x86/Kconfig.debug_cpu b/src/cpu/x86/Kconfig.debug_cpu
index f8ed370486..7edb60f445 100644
--- a/src/cpu/x86/Kconfig.debug_cpu
+++ b/src/cpu/x86/Kconfig.debug_cpu
@@ -1,3 +1,5 @@
+if ARCH_X86
+
 config HAVE_DEBUG_CAR
 	bool
 
@@ -11,3 +13,5 @@ config DISPLAY_MTRRS
 config DEBUG_SMM_RELOCATION
 	bool "Debug SMM relocation code"
 	depends on HAVE_SMI_HANDLER && SMM_ASEG
+
+endif # ARCH_X86