Various Kconfig files still have references to CONFIG_ variables. Some in harmless comments, some in config definionts which is not harmless. All removed

5 files changed, 12 insertions, 12 deletions

diff --git a/apps/examples/pwm/Kconfig b/apps/examples/pwm/Kconfig
index 78edd2178..b9b28fd79 100644
--- a/apps/examples/pwm/Kconfig
+++ b/apps/examples/pwm/Kconfig
@@ -35,14 +35,14 @@ config EXAMPLES_PWM_DURATION
 	default 5 if !EXAMPLES_PWM_PULSECOUNT
 	---help---
 		The default PWM pulse train duration in seconds.  Used only if the current
-		pulse count is zero (pulse countis only supported if CONFIG_PWM_PULSECOUNT
+		pulse count is zero (pulse countis only supported if PWM_PULSECOUNT
 		is defined). Default: 5 seconds
 
 config EXAMPLES_PWM_PULSECOUNT
 	int "Default pulse count"
 	default 0
 	---help---
-	The initial PWM pulse count.  This option is only available if CONFIG_PWM_PULSECOUNT
+	The initial PWM pulse count.  This option is only available if PWM_PULSECOUNT
 	is nonzero. Default: 0 (i.e., use the duration, not the count).
 
 endif
diff --git a/apps/examples/usbstorage/Kconfig b/apps/examples/usbstorage/Kconfig
index 96af82b21..823ae2953 100644
--- a/apps/examples/usbstorage/Kconfig
+++ b/apps/examples/usbstorage/Kconfig
@@ -90,7 +90,7 @@ config EXAMPLES_USBMSC_TRACEINIT
 	default n
 	depends on EXAMPLES_USBMSC
 	---help---
-		If USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB),
+		If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
 		then the example code will also manage the USB trace output.  The
 		amount of trace output can be controlled this configuration value:
 		This setting will show USB initialization events
@@ -100,7 +100,7 @@ config EXAMPLES_USBMSC_TRACECLASS
 	default n
 	depends on EXAMPLES_USBMSC
 	---help---
-		If USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB),
+		If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
 		then the example code will also manage the USB trace output.  The
 		amount of trace output can be controlled this configuration value:
 		This setting will show USB class driver events
@@ -110,7 +110,7 @@ config EXAMPLES_USBMSC_TRACETRANSFERS
 	default n
 	depends on EXAMPLES_USBMSC
 	---help---
-		If USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB),
+		If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
 		then the example code will also manage the USB trace output.  The
 		amount of trace output can be controlled this configuration value:
 		This setting will show USB data transfer events
@@ -120,7 +120,7 @@ config EXAMPLES_USBMSC_TRACECONTROLLER
 	default n
 	depends on EXAMPLES_USBMSC
 	---help---
-		If USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB),
+		If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
 		then the example code will also manage the USB trace output.  The
 		amount of trace output can be controlled this configuration value:
 		This setting will show USB device controller events
@@ -130,7 +130,7 @@ config EXAMPLES_USBMSC_TRACEINTERRUPTS
 	default n
 	depends on EXAMPLES_USBMSC
 	---help---
-		If USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB),
+		If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
 		then the example code will also manage the USB trace output.  The
 		amount of trace output can be controlled this configuration value:
 		This setting will show USB device controller interrupt-related events.
diff --git a/apps/examples/watchdog/Kconfig b/apps/examples/watchdog/Kconfig
index 18daf9327..ff27dc079 100644
--- a/apps/examples/watchdog/Kconfig
+++ b/apps/examples/watchdog/Kconfig
@@ -17,14 +17,14 @@ config EXAMPLES_WATCHDOG_DEVPATH
 	---help---
 		The path to the watchdog device. Default: /dev/watchdog0
 
-config CONFIG_EXAMPLES_WATCHDOG_PINGTIME
+config EXAMPLES_WATCHDOG_PINGTIME
 	int "Watchdog ping time"
 	default 5000
 	---help---
 		Time in milliseconds that the example will ping the watchdog before letting the
 		watchdog expire. Default: 5000 milliseconds.
 
-config CONFIG_EXAMPLES_WATCHDOG_PINGDELAY
+config EXAMPLES_WATCHDOG_PINGDELAY
 	int "Watchdog ping delay"
 	default 500
 	---help---
diff --git a/apps/netutils/discover/Kconfig b/apps/netutils/discover/Kconfig
index e1fc0d4e0..2e088506f 100644
--- a/apps/netutils/discover/Kconfig
+++ b/apps/netutils/discover/Kconfig
@@ -33,7 +33,7 @@ config DISCOVER_DEVICE_CLASS
 	hex "Network Discovery Class"
 	default 0xff
 
-config CONFIG_DISCOVER_DESCR
+config DISCOVER_DESCR
 	string "Discoverer Description"
 	default "NuttX"
 
diff --git a/apps/netutils/webserver/Kconfig b/apps/netutils/webserver/Kconfig
index 69a39510d..543415a9e 100644
--- a/apps/netutils/webserver/Kconfig
+++ b/apps/netutils/webserver/Kconfig
@@ -50,10 +50,10 @@ config NETUTILS_HTTPD_CGIPATH
 		httpd_cgi_register(&a[i]);
 		}
 
-		Where (under CONFIG_NETUTILS_HTTPD_CGIPATH) the "/xyz" is a URL path,
+		Where (under NETUTILS_HTTPD_CGIPATH) the "/xyz" is a URL path,
 		rather than a %! xyz style call in the existing manner.
 
-		This is useful when CONFIG_NETUTILS_HTTPD_SCRIPT_DISABLE is defined.
+		This is useful when NETUTILS_HTTPD_SCRIPT_DISABLE is defined.
 
 		In other words, this provides a way to get your CGI functions called
 		without needing the scripting language. I'm using this to provide a