diff --git a/src/Kconfig b/src/Kconfig
index 3752e11251..74b892e15a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -214,33 +214,6 @@ config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	 The relocated ramstage is saved in an area specified by the
 	 by the board and/or chipset.
 
-# TODO: This doesn't belong here, move to src/arch/x86/Kconfig
-choice
-	prompt "Bootblock behaviour"
-	default BOOTBLOCK_SIMPLE
-
-config BOOTBLOCK_SIMPLE
-	bool "Always load fallback"
-
-config BOOTBLOCK_NORMAL
-	bool "Switch to normal if CMOS says so"
-
-endchoice
-
-config BOOTBLOCK_SOURCE
-	string
-	default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
-	default "bootblock_normal.c" if BOOTBLOCK_NORMAL
-
-config SKIP_MAX_REBOOT_CNT_CLEAR
-	bool "Do not clear reboot count after successful boot"
-	depends on BOOTBLOCK_NORMAL
-	help
-	  Do not clear the reboot count immediately after successful boot.
-	  Set to allow the payload to control normal/fallback image recovery.
-	  Note that it is the responsibility of the payload to reset the
-	  normal boot bit to 1 after each successsful boot.
-
 config UPDATE_IMAGE
 	bool "Update existing coreboot.rom image"
 	help
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 6280024bdf..c153a74388 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -214,3 +214,29 @@ config ROMSTAGE_DEBUG_SPINLOOP
 	help
 	  Add a spin (JMP .) in assembly_entry.S during early romstage to wait
 	  for a JTAG debugger to break into the execution sequence.
+
+choice
+	prompt "Bootblock behaviour"
+	default BOOTBLOCK_SIMPLE
+
+config BOOTBLOCK_SIMPLE
+	bool "Always load fallback"
+
+config BOOTBLOCK_NORMAL
+	bool "Switch to normal if CMOS says so"
+
+endchoice
+
+config BOOTBLOCK_SOURCE
+	string
+	default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
+	default "bootblock_normal.c" if BOOTBLOCK_NORMAL
+
+config SKIP_MAX_REBOOT_CNT_CLEAR
+	bool "Do not clear reboot count after successful boot"
+	depends on BOOTBLOCK_NORMAL
+	help
+	  Do not clear the reboot count immediately after successful boot.
+	  Set to allow the payload to control normal/fallback image recovery.
+	  Note that it is the responsibility of the payload to reset the
+	  normal boot bit to 1 after each successsful boot.