From 3fa41c0f183dfec4ab7a054553dca48409162f0d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 17 Jun 2016 19:30:19 -0600
Subject: [PATCH] Kconfig files: Fix some dependencies that have CONFIG_ in the
 variable name

---
 arch/arm/src/sam34/Kconfig | 4 ++--
 arch/arm/src/sama5/Kconfig | 4 ++--
 arch/arm/src/samv7/Kconfig | 4 ++--
 binfmt/libelf/Kconfig      | 2 +-
 binfmt/libnxflat/Kconfig   | 2 +-
 binfmt/libpcode/Kconfig    | 2 +-
 drivers/input/Kconfig      | 2 +-
 sched/Kconfig              | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index bc191c88df..8e764dff40 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -1369,7 +1369,7 @@ config SAM34_HSMCI_WRPROOF
 
 config SAM34_HSMCI_XFRDEBUG
 	bool "HSMCI transfer debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI data transfers.
@@ -1381,7 +1381,7 @@ config SAM34_HSMCI_XFRDEBUG
 
 config SAM34_HSMCI_CMDDEBUG
 	bool "HSMCI command debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI commands. This
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index 4f7b2371db..11aa7179f1 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -2857,7 +2857,7 @@ config SAMA5_HSMCI_WRPROOF
 
 config SAMA5_HSMCI_XFRDEBUG
 	bool "HSMCI transfer debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI data transfers.
@@ -2869,7 +2869,7 @@ config SAMA5_HSMCI_XFRDEBUG
 
 config SAMA5_HSMCI_CMDDEBUG
 	bool "HSMCI command debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI commands. This
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index 1f217e5d4a..55eb92d485 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -1634,7 +1634,7 @@ config SAMV7_HSMCI_UNALIGNED
 
 config SAMV7_HSMCI_XFRDEBUG
 	bool "HSMCI transfer debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI data transfers.
@@ -1646,7 +1646,7 @@ config SAMV7_HSMCI_XFRDEBUG
 
 config SAMV7_HSMCI_CMDDEBUG
 	bool "HSMCI command debug"
-	depends on DEBUG_FS && CONFIG_DEBUG_INFO
+	depends on DEBUG_FS_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI commands. This
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 684eaba8be..5580a70a47 100644
--- a/binfmt/libelf/Kconfig
+++ b/binfmt/libelf/Kconfig
@@ -35,7 +35,7 @@ config ELF_BUFFERINCR
 config ELF_DUMPBUFFER
 	bool "Dump ELF buffers"
 	default n
-	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
+	depends on DEBUG_INFO
 	---help---
 		Dump various ELF buffers for debug purposes
 
diff --git a/binfmt/libnxflat/Kconfig b/binfmt/libnxflat/Kconfig
index 6929b04296..66c0031528 100644
--- a/binfmt/libnxflat/Kconfig
+++ b/binfmt/libnxflat/Kconfig
@@ -6,4 +6,4 @@
 config NXFLAT_DUMPBUFFER
 	bool "Dump NXFLAT buffers"
 	default n
-	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
+	depends on DEBUG_INFO
diff --git a/binfmt/libpcode/Kconfig b/binfmt/libpcode/Kconfig
index c767aca790..046dc71c55 100644
--- a/binfmt/libpcode/Kconfig
+++ b/binfmt/libpcode/Kconfig
@@ -64,6 +64,6 @@ endif # PCODE_TEST_FS
 config PCODE_DUMPBUFFER
 	bool "Dump P-code buffers"
 	default n
-	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
+	depends on DEBUG_INFO
 	---help---
 		Dump various P-code buffers for debug purposes
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index e28d053af7..0fc96d6c91 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -179,7 +179,7 @@ config MXT_NPOLLWAITERS
 config MXT_DISABLE_CONFIG_DEBUG_INFO
 	bool "Disable verbose debug output"
 	default y
-	depends on CONFIG_DEBUG_INFO && DEBUG_INPUT
+	depends on DEBUG_INPUT_INFO
 	---help---
 		The maXTouch tends to generate interrupts at a high rate during the
 		contact.  If verbose debug is enabled in this driver, you may not
diff --git a/sched/Kconfig b/sched/Kconfig
index 69b4945fd1..864220286a 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -1013,7 +1013,7 @@ config MODULE_BUFFERINCR
 config MODULE_DUMPBUFFER
 	bool "Dump module buffers"
 	default n
-	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
+	depends on DEBUG_INFO
 	---help---
 		Dump various module buffers for debug purposes