[coreboot-gerrit] Change in ...coreboot[master]: cpu/x86/Kconfig.debug: Move more options here

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29751


Change subject: cpu/x86/Kconfig.debug: Move more options here
......................................................................

cpu/x86/Kconfig.debug: Move more options here

Gather x86 specific debug options and deflate their code a little. We
keep their hiding rules and help texts, although they don't seem much
useful.

Change-Id: I3bb8e759fc6a4871d30fccff47babfb7a291b45c
Signed-off-by: Nico Huber <nico.h at gmx.de>
---
M src/Kconfig
M src/cpu/x86/Kconfig.debug
2 files changed, 24 insertions(+), 30 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/29751/1

diff --git a/src/Kconfig b/src/Kconfig
index aded1ef..84d200c 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -727,24 +727,6 @@
 
 	  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 @@
 
 	  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 2348231..c5e21ef 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.

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29751
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3bb8e759fc6a4871d30fccff47babfb7a291b45c
Gerrit-Change-Number: 29751
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181120/c295a3e6/attachment.html>