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

14 files changed, 30 insertions, 30 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
diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index f5b8de094..30178dd38 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -105,7 +105,7 @@ config APPS_DIR
 			|
 			`- Makefile
 		
-		Then you would set CONFIG_APPS_DIR=../application.
+		Then you would set APPS_DIR=../application.
 
 		The application direction must contain Makefile and this make
 		file must support the following targets:
@@ -142,7 +142,7 @@ config BUILD_2PASS
 		options configure the make system build a extra link object. This link object
 		is assumed to be an incremental (relative) link object, but could be a static
 		library (archive) (some modification to this Makefile would be required if
-		CONFIG_PASS1_TARGET generates an archive). Pass 1 1ncremental (relative) link
+		PASS1_TARGET generates an archive). Pass 1 1ncremental (relative) link
 		objects should be put into the processor-specific source directory (where other
 		link objects will be created).  If the pass1 obect is an archive, it could
 		go anywhere.
@@ -163,7 +163,7 @@ config PASS1_BUILDIR
 		The path, relative to the top NuttX build
 		directory to directory that contains the Makefile to build the
 		first pass object.  The Makefile must support the following targets:
-		The special target CONFIG_PASS1_TARGET (if defined)
+		The special target PASS1_TARGET (if defined)
 		and the usual depend, clean, and distclean targets.
 
 config PASS1_OBJECT
@@ -172,7 +172,7 @@ config PASS1_OBJECT
 	---help---
 		May be used to include an extra, pass1 object
 		into the final link.  This would probably be the object generated
-		from the CONFIG_PASS1_TARGET.  It may be available at link time
+		from the PASS1_TARGET.  It may be available at link time
 		in the arch/<architecture>/src directory.
 
 config NUTTX_KERNEL
diff --git a/nuttx/arch/sim/Kconfig b/nuttx/arch/sim/Kconfig
index dc3a85b54..e88267053 100644
--- a/nuttx/arch/sim/Kconfig
+++ b/nuttx/arch/sim/Kconfig
@@ -27,7 +27,7 @@ config SIM_WALLTIME
 		calls the system timer "interrupt handler" as fast as possible.  As a result, there
 		really are no noticeable delays when a task sleeps.  However, the task really does
 		sleep -- but the time scale is wrong.  If you want behavior that is closer to
-		normal timing, then you can define CONFIG_SIM_WALLTIME=y in your configuration
+		normal timing, then you can define SIM_WALLTIME=y in your configuration
 		file.  This configuration setting will cause the sim target's IDLE loop to delay
 		on each call so that the system "timer interrupt" is called at a rate approximately
 		correct for the system timer tick rate.  With this definition in the configuration,
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 16b41ba74..18859be86 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -535,7 +535,7 @@ config ARCH_BOARD_STM32F3_DISCOVERY
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		STMicro STM32F3-Discovery board based on the STMicro CONFIG_ARCH_CHIP_STM32F303VCT6 MCU.
+		STMicro STM32F3-Discovery board based on the STMicro ARCH_CHIP_STM32F303VCT6 MCU.
 
 config ARCH_BOARD_STM32F4_DISCOVERY
 	bool "STMicro STM32F4-Discovery board"
diff --git a/nuttx/configs/stm3220g-eval/Kconfig b/nuttx/configs/stm3220g-eval/Kconfig
index 33e172cfc..300788c9b 100644
--- a/nuttx/configs/stm3220g-eval/Kconfig
+++ b/nuttx/configs/stm3220g-eval/Kconfig
@@ -21,7 +21,7 @@ config LCD_RDSHIFT
 		When reading 16-bit gram data, there appears to be a shift in the returned
 		data.  This value fixes the offset.  Default 5.
 
-config CONFIG_STM32_ILI9320_DISABLE
+config STM32_ILI9320_DISABLE
 	bool "Disable LCD_ILI9320 (and LCD_ILI9321) support"
 	default n
 	depends on STM3220G_LCD
@@ -30,7 +30,7 @@ config CONFIG_STM32_ILI9320_DISABLE
 		ID value.  However, code size can be reduced by suppressing support for
 		individual LCDs using this option.
 
-config CONFIG_STM32_ILI9325_DISABLE
+config STM32_ILI9325_DISABLE
 	bool "Disable LCD_ILI9325 support"
 	default n
 	depends on STM3220G_LCD
diff --git a/nuttx/configs/stm3240g-eval/Kconfig b/nuttx/configs/stm3240g-eval/Kconfig
index ae73d21e4..26503761e 100644
--- a/nuttx/configs/stm3240g-eval/Kconfig
+++ b/nuttx/configs/stm3240g-eval/Kconfig
@@ -21,7 +21,7 @@ config LCD_RDSHIFT
 		When reading 16-bit gram data, there appears to be a shift in the returned
 		data.  This value fixes the offset.  Default 5.
 
-config CONFIG_STM32_ILI9320_DISABLE
+config STM32_ILI9320_DISABLE
 	bool "Disable LCD_ILI9320 (and LCD_ILI9321) support"
 	default n
 	depends on STM3240G_LCD
@@ -30,7 +30,7 @@ config CONFIG_STM32_ILI9320_DISABLE
 		ID value.  However, code size can be reduced by suppressing support for
 		individual LCDs using this option.
 
-config CONFIG_STM32_ILI9325_DISABLE
+config STM32_ILI9325_DISABLE
 	bool "Disable LCD_ILI9325 support"
 	default n
 	depends on STM3240G_LCD
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig
index 94834805e..889f2000b 100644
--- a/nuttx/drivers/usbdev/Kconfig
+++ b/nuttx/drivers/usbdev/Kconfig
@@ -259,7 +259,7 @@ config CDCACM_COMPOSITE
 	depends on USBDEV_COMPOSITE
 	---help---
 		Configure the CDC serial driver as part of a composite driver
-		(only if CONFIG_USBDEV_COMPOSITE is also defined)
+		(only if USBDEV_COMPOSITE is also defined)
 
 config CDCACM_IFNOBASE
 	int "Offset the CDC/ACM interface numbers"
@@ -281,7 +281,7 @@ config CDCACM_STRBASE
 		unique and contiguous.  When used with the Mass Storage driver, the
 		correct value for this offset is four (this value actuallly only needs
 		to be defined if names are provided for the Notification interface,
-		config CDCACM_NOTIFSTR, or the data interface, CONFIG_CDCACM_DATAIFSTR).
+		config CDCACM_NOTIFSTR, or the data interface, CDCACM_DATAIFSTR).
 
 config CDCACM_EP0MAXPACKET
 	int "Endpoint 0 max packet size"
@@ -432,7 +432,7 @@ config USBMSC_COMPOSITE
 	depends on USBDEV_COMPOSITE
 	---help---
 		Configure the mass storage driver as part of a composite driver
-		(only if CONFIG_USBDEV_COMPOSITE is also defined)
+		(only if USBDEV_COMPOSITE is also defined)
 
 config USBMSC_IFNOBASE
 	int "Offset the mass storage interface number"
@@ -454,7 +454,7 @@ config USBMSC_STRBASE
 		be defined to offset the mass storage string numbers so that they are
 		unique and contiguous.  When used with the CDC/ACM driver, the
 		correct value for this offset is four (or perhaps 5 or 6, depending
-		on if CONFIG_CDCACM_NOTIFSTR or CONFIG_CDCACM_DATAIFSTR are defined).
+		on if CDCACM_NOTIFSTR or CDCACM_DATAIFSTR are defined).
 
 config USBMSC_EP0MAXPACKET
 	int "Max packet size for endpoint 0"
diff --git a/nuttx/fs/fat/Kconfig b/nuttx/fs/fat/Kconfig
index a20347885..1831efc77 100644
--- a/nuttx/fs/fat/Kconfig
+++ b/nuttx/fs/fat/Kconfig
@@ -32,7 +32,7 @@ config FAT_MAXFNAME
 	depends on FAT_LFN
 	default 32
 	---help---
-		If CONFIG_FAT_LFN is defined, then the default, maximum long file
+		If FAT_LFN is defined, then the default, maximum long file
 		name is 255 bytes.  This can eat up a lot of memory (especially stack
 		space).  If you are willing to live with some non-standard, short long
 		file names, then define this value to be something more reasonable.  A
diff --git a/nuttx/mm/Kconfig b/nuttx/mm/Kconfig
index 57b039fa9..960c979e8 100644
--- a/nuttx/mm/Kconfig
+++ b/nuttx/mm/Kconfig
@@ -53,7 +53,7 @@ config MM_SMALL
 		have smaller overhead than devices that support 32-bit addressability.
 		However, there are many MCUs that support 32-bit addressability *but*
 		have internal SRAM of size less than or equal to 64Kb.  In this case,
-		CONFIG_MM_SMALL can be defined so that those MCUs will also benefit
+		MM_SMALL can be defined so that those MCUs will also benefit
 		from the smaller, 16-bit-based allocation overhead.
 
 		NOTE: If MM_MULTIHEAP is selected, then this applies to all heaps.
@@ -126,5 +126,5 @@ config DEBUG_GRAN
 	default n
 	depends on GRAN && DEBUG
 	---help---
-		Just like CONFIG_DEBUG_MM, but only generates ouput from the gran
+		Just like DEBUG_MM, but only generates ouput from the gran
 		allocation logic.
diff --git a/nuttx/sched/Kconfig b/nuttx/sched/Kconfig
index e461b704b..1fb0ecf6f 100644
--- a/nuttx/sched/Kconfig
+++ b/nuttx/sched/Kconfig
@@ -130,7 +130,7 @@ config PREALLOC_CHILDSTATUS
 		setting is not defined or if it is defined to be zero then a value
 		of 2*MAX_TASKS is used.
 
-		Note that there cannot be more that CONFIG_MAX_TASKS tasks in total.
+		Note that there cannot be more that MAX_TASKS tasks in total.
 		However, the number of child status structures may need to be
 		significantly larger because this number includes the maximum number
 		of tasks that are running PLUS the number of tasks that have exit'ed