diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:52:00 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:52:00 -0600 |
commit | 561c54964b2c99b1709fa79ee98aea31e7d7d449 (patch) | |
tree | c6f4c2610a9850b76b54b9716d3c51bdf4af3e56 /nuttx | |
parent | 1ffc15c3233c8d61953fc2ebc80b5d3c46fc429f (diff) | |
download | px4-nuttx-561c54964b2c99b1709fa79ee98aea31e7d7d449.tar.gz px4-nuttx-561c54964b2c99b1709fa79ee98aea31e7d7d449.tar.bz2 px4-nuttx-561c54964b2c99b1709fa79ee98aea31e7d7d449.zip |
Various Kconfig files still have references to CONFIG_ variables. Some in harmless comments, some in config definionts which is not harmless. All removed
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Kconfig | 8 | ||||
-rw-r--r-- | nuttx/arch/sim/Kconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/Kconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/stm3220g-eval/Kconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/Kconfig | 4 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/Kconfig | 8 | ||||
-rw-r--r-- | nuttx/fs/fat/Kconfig | 2 | ||||
-rw-r--r-- | nuttx/mm/Kconfig | 4 | ||||
-rw-r--r-- | nuttx/sched/Kconfig | 2 |
9 files changed, 18 insertions, 18 deletions
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 |