diff --git a/src/Kconfig b/src/Kconfig
index 83fcc29b1c..62a7a92368 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -727,24 +727,6 @@ config DEBUG_RAM_SETUP
 
 	  If unsure, say N.
 
-config HAVE_DEBUG_CAR
-	def_bool n
-
-config DEBUG_CAR
-	def_bool n
-	depends on HAVE_DEBUG_CAR
-
-if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
-# Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional
-# printk(BIOS_DEBUG, ...) calls.
-config DEBUG_CAR
-	bool "Output verbose Cache-as-RAM debug messages"
-	default n
-	depends on HAVE_DEBUG_CAR
-	help
-	  This option enables additional CAR related debug messages.
-endif
-
 config DEBUG_PIRQ
 	bool "Check PIRQ table consistency"
 	default n
@@ -778,18 +760,6 @@ config DEBUG_SMI
 
 	  If unsure, say N.
 
-config DEBUG_SMM_RELOCATION
-	bool "Debug SMM relocation code"
-	default n
-	depends on HAVE_SMI_HANDLER
-	help
-	  This option enables additional SMM handler relocation related
-	  debug messages.
-
-	  Note: This option will increase the size of the coreboot image.
-
-	  If unsure, say N.
-
 # Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional
 # printk(BIOS_DEBUG, ...) calls.
 config DEBUG_MALLOC
diff --git a/src/cpu/x86/Kconfig.debug b/src/cpu/x86/Kconfig.debug
index 2348231c58..c5e21efae1 100644
--- a/src/cpu/x86/Kconfig.debug
+++ b/src/cpu/x86/Kconfig.debug
@@ -1,6 +1,30 @@
+config HAVE_DEBUG_CAR
+	bool
+
+config DEBUG_CAR
+	bool
+	depends on HAVE_DEBUG_CAR
+	# Only visible if debug level is DEBUG (7) or SPEW (8) as it does
+	# additional printk(BIOS_DEBUG, ...) calls.
+	prompt "Output verbose Cache-as-RAM debug messages" \
+		if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
+	help
+	  This option enables additional CAR related debug messages.
+
 config HAVE_DISPLAY_MTRRS
 	bool
 
 config DISPLAY_MTRRS
 	bool "Display intermediate MTRR settings"
 	depends on HAVE_DISPLAY_MTRRS
+
+config DEBUG_SMM_RELOCATION
+	bool "Debug SMM relocation code"
+	depends on HAVE_SMI_HANDLER
+	help
+	  This option enables additional SMM handler relocation related
+	  debug messages.
+
+	  Note: This option will increase the size of the coreboot image.
+
+	  If unsure, say N.