[SQUASH] ASoC: SOF: Kconfig: cleanup Kconfig debug options

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

sound/soc/sof/Kconfig

@@ -7,7 +7,6 @@ config SND_SOC_SOF_ACPI
 config SND_SOC_SOF_PLATFORM
 	tristate
 
-
 config SND_SOC_SOF
 	tristate "Sound Open Firmware Support"
 	default m
@@ -29,9 +28,19 @@ config SND_SOC_SOF_NOCODEC
           Say Y if you need this nocodec fallback option
           If unsure select "N".
 
+config SND_SOC_SOF_DEBUG
+	bool "SOF debugging features"
+	depends on SND_SOC_SOF
+	help
+	  This option can be used to enable or disable individual SOF firmware
+	  and driver debugging options.
+	  Say Y if you are debugging SOF FW or drivers.
+          If unsure select "N".
+
 config SND_SOC_SOF_FORCE_NOCODEC_MODE
-	tristate "SOF force nocodec Mode"
+	bool "SOF force nocodec Mode"
 	depends on SND_SOC_SOF_NOCODEC
+	depends on SND_SOC_SOF_DEBUG
 	help
           This forces SOF to use dummy/nocodec as machine driver, even
 	  though there is a codec detected on the real platform. This is
@@ -41,5 +50,14 @@ config SND_SOC_SOF_FORCE_NOCODEC_MODE
           Say Y if you need this force nocodec mode option
           If unsure select "N".
 
+config SND_SOC_SOF_DEBUG_XRUN_STOP
+	bool "SOF stop on XRUN"
+	depends on SND_SOC_SOF_DEBUG
+	help
+	  This option forces PCMs to stop on any XRUN event. This is useful to
+	  preserve any trace data ond pipeline status prior to the XRUN.
+	  Say Y if you are debugging SOF FW pipeline XRUNs.
+          If unsure select "N".
+
 source "sound/soc/sof/intel/Kconfig"
 source "sound/soc/sof/xtensa/Kconfig"