diff --git a/src/Kconfig b/src/Kconfig
index dfd703630c..93df67ed3d 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -933,18 +933,6 @@ config PCI_IO_CFG_EXT
 	bool
 	default n
 
-config IOAPIC
-	bool
-	default y if SMP
-	default n
-
-config IOAPIC_8BIT_ID
-	bool
-	default n
-	depends on IOAPIC
-	help
-	  Select this option if the hardware support 8bit long IOAPIC IDs.
-
 config USE_WATCHDOG_ON_BOOT
 	bool
 	default n
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 8e6babceb3..7f10f9a20f 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -466,4 +466,16 @@ config SOC_BERT_SIZEOF_ERROR_SECTION
 	help
 	  SoC selects this if it implements soc_bert_sizeof_error_section.
 
+config IOAPIC
+	bool
+	default y if SMP
+	default n
+
+config IOAPIC_8BIT_ID
+	bool
+	default n
+	depends on IOAPIC
+	help
+	  Select this option if the hardware support 8bit long IOAPIC IDs.
+
 endif