CONFIG_NXTERM_NPOLLWAITERS:
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 2f6fbaf601..c0c6eb1fca 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -2257,23 +2257,23 @@ The system can be re-made subsequently by just typing make.
System Timer
In most implementations, system time is provided by a timer interrupt.
- That timer interrupt runs at rate determined by CONFIG_USEC_PER_TICKS (default 10000 microseconds or 100Hz. If CONFIG_SCHED_TICKLESS is selected, the default is 100 microseconds).
- The timer generates an interrupt each CONFIG_USEC_PER_TICKS microseconds and increments a counter called g_system_timer.
- g_system_timer then provides a time-base for calculating up-time and elapsed time intervals in units of CONFIG_USEC_PER_TICKS.
+ That timer interrupt runs at rate determined by CONFIG_USEC_PER_TICK (default 10000 microseconds or 100Hz. If CONFIG_SCHED_TICKLESS is selected, the default is 100 microseconds).
+ The timer generates an interrupt each CONFIG_USEC_PER_TICK microseconds and increments a counter called g_system_timer.
+ g_system_timer then provides a time-base for calculating up-time and elapsed time intervals in units of CONFIG_USEC_PER_TICK.
The range of g_system_timer is, by default, 32-bits.
However, if the MCU supports type long long and CONFIG_SYSTEM_TIME16 is selected,
a 64-bit system timer will be supported instead.
System Timer Accuracy
- On many system, the exact timer interval specified by CONFIG_USEC_PER_TICKS cannot be achieved due to limitations in frequencies or in dividers.
- As a result, the time interval specified by CONFIG_USEC_PER_TICKS may only be approximate and there may be small errors in the apparent up-time time.
+ On many system, the exact timer interval specified by CONFIG_USEC_PER_TICK cannot be achieved due to limitations in frequencies or in dividers.
+ As a result, the time interval specified by CONFIG_USEC_PER_TICK may only be approximate and there may be small errors in the apparent up-time time.
These small errors, however, will accumulate over time and after a long period of time may have an unacceptably large error in the apparent up-time of the MCU.
- If the timer tick period generated by the hardware is not exactly CONFIG_USEC_PER_TICKS and if there you require accurate up-time for the MCU, then there are measures that you can take:
+ If the timer tick period generated by the hardware is not exactly CONFIG_USEC_PER_TICK and if there you require accurate up-time for the MCU, then there are measures that you can take:
-
- Perhaps you can adjust
CONFIG_USEC_PER_TICKS to a different value so that an exactly CONFIG_USEC_PER_TICKS can be realized.
+ Perhaps you can adjust CONFIG_USEC_PER_TICK to a different value so that an exactly CONFIG_USEC_PER_TICK can be realized.
-
Or you can use a technique known as Delta-Sigma Modulation. (Suggested by Uros Platise). Consider the example below.
@@ -2284,7 +2284,7 @@ The system can be re-made subsequently by just typing
make.
Consider this case: The system timer is a count-up timer driven at 32.768KHz.
There are dividers that can be used, but a divider of one yields the highest accuracy.
This counter counts up until the count equals a match value, then a timer interrupt is generated.
- The desire frequency is 100Hz (CONFIG_USEC_PER_TICKS is 10000).
+ The desire frequency is 100Hz (CONFIG_USEC_PER_TICK is 10000).
This exact frequency of 100Hz cannot be obtained in this case.
diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html
index 4e028ae0bd..cdca1f59b1 100644
--- a/Documentation/NuttxUserGuide.html
+++ b/Documentation/NuttxUserGuide.html
@@ -4729,7 +4729,7 @@ Differences from the POSIX implementation include:
-
All
sa_flags in struct sigaction of act input are ignored (all treated like SA_SIGINFO).
- The one exception is if CONFIG_SCHED_CHILDSTATUS is defined;
+ The one exception is if CONFIG_SCHED_CHILD_STATUS is defined;
then SA_NOCLDWAIT is supported but only for SIGCHLD.
diff --git a/arch/arm/src/lpc2378/Kconfig b/arch/arm/src/lpc2378/Kconfig
index b0637400c9..e9dd177782 100644
--- a/arch/arm/src/lpc2378/Kconfig
+++ b/arch/arm/src/lpc2378/Kconfig
@@ -56,7 +56,7 @@ config LPC2378_MAM_SETUP
bool "Configure the Memory Accelerator Module (MAM)"
default y
-config LPC2378_LPC2378_MAMCR_VALUE
+config LPC2378_MAMCR_VALUE
int "Memory accelerator mode"
default 1
range 0 2
@@ -67,7 +67,7 @@ config LPC2378_LPC2378_MAMCR_VALUE
PART 1
FULL 2
-config LPC2378_LPC2378_MAMTIM_VALUE
+config LPC2378_MAMTIM_VALUE
int "Memory accelerator timing value"
default 3
---help---
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index d8a48709e7..237dc1ac25 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -73,7 +73,7 @@
* mtd device on the SPIFI FLASH. NOTE: CONFIG_LPC43_SPIFI=y must also
* be defined to enable SPIFI setup support:
*
- * CONFIG_SPIFI_RDONLY - Create a read only device on SPIFI.
+ * CONFIG_SPIFI_READONLY - Create a read only device on SPIFI.
* CONFIG_SPIFI_OFFSET - Offset the beginning of the block driver this many
* bytes into the device address space. This offset must be an exact
* multiple of the erase block size. Default 0.
diff --git a/arch/arm/src/nuc1xx/nuc_config.h b/arch/arm/src/nuc1xx/nuc_config.h
index e985c2344a..11f3e3f04e 100644
--- a/arch/arm/src/nuc1xx/nuc_config.h
+++ b/arch/arm/src/nuc1xx/nuc_config.h
@@ -73,19 +73,19 @@
#ifndef CONFIG_NUC_UART0
# undef CONFIG_UART0_SERIAL_CONSOLE
-# undef CONFIG_UART0_FLOW_CONTROL
+# undef CONFIG_UART0_FLOWCONTROL
# undef CONFIG_UART0_IRDAMODE
# undef CONFIG_UART0_RS485MODE
#endif
#ifndef CONFIG_NUC_UART1
# undef CONFIG_UART1_SERIAL_CONSOLE
-# undef CONFIG_UART1_FLOW_CONTROL
+# undef CONFIG_UART1_FLOWCONTROL
# undef CONFIG_UART1_IRDAMODE
# undef CONFIG_UART1_RS485MODE
#endif
-#undef CONFIG_UART2_FLOW_CONTROL /* UART2 does not support flow control */
+#undef CONFIG_UART2_FLOWCONTROL /* UART2 does not support flow control */
#ifndef CONFIG_NUC_UART2
# undef CONFIG_UART2_SERIAL_CONSOLE
# undef CONFIG_UART2_IRDAMODE
diff --git a/arch/arm/src/nuc1xx/nuc_lowputc.c b/arch/arm/src/nuc1xx/nuc_lowputc.c
index c66a20d87a..dc22db8774 100644
--- a/arch/arm/src/nuc1xx/nuc_lowputc.c
+++ b/arch/arm/src/nuc1xx/nuc_lowputc.c
@@ -160,7 +160,7 @@ void nuc_lowsetup(void)
regval = getreg32(NUC_GCR_GPB_MFP);
#ifdef CONFIG_NUC_UART0
-#ifdef CONFIG_UART0_FLOW_CONTROL
+#ifdef CONFIG_UART0_FLOWCONTROL
regval |= (GCR_GPB_MFP0 | GCR_GPB_MFP1 | GCR_GPB_MFP2| GCR_GPB_MFP3);
#else
regval |= (GCR_GPB_MFP0 | GCR_GPB_MFP1);
@@ -173,7 +173,7 @@ void nuc_lowsetup(void)
*/
#ifdef CONFIG_NUC_UART1
-#ifdef CONFIG_UART1_FLOW_CONTROL
+#ifdef CONFIG_UART1_FLOWCONTROL
regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5 | GCR_GPB_MFP6| GCR_GPB_MFP7)
#else
regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5);
@@ -182,14 +182,14 @@ void nuc_lowsetup(void)
putreg32(regval, NUC_GCR_GPB_MFP);
-#if defined(CONFIG_UART0_FLOW_CONTROL) || defined(CONFIG_UART1_FLOW_CONTROL)
+#if defined(CONFIG_UART0_FLOWCONTROL) || defined(CONFIG_UART1_FLOWCONTROL)
regval = getreg32(NUC_GCR_ALT_MFP);
regval &= ~GCR_ALT_MFP_EBI_EN;
-#ifdef CONFIG_UART0_FLOW_CONTROL
+#ifdef CONFIG_UART0_FLOWCONTROL
regval &= ~(GCR_ALT_MFP_EBI_NWRL_EN | GCR_ALT_MFP_EBI_NWRH_WN);
#endif
putreg32(NUC_GCR_ALT_MFP);
-#endif /* CONFIG_UART0_FLOW_CONTROL || CONFIG_UART1_FLOW_CONTROL */
+#endif /* CONFIG_UART0_FLOWCONTROL || CONFIG_UART1_FLOWCONTROL */
#endif /* CONFIG_NUC_UART0 || CONFIG_NUC_UART1 */
/* UART1 TX/RX support requires that GPIOD bits 14 and 15 be set. UART2
diff --git a/arch/arm/src/samdl/sam_config.h b/arch/arm/src/samdl/sam_config.h
index a7fbbe9d6e..846e3291d3 100644
--- a/arch/arm/src/samdl/sam_config.h
+++ b/arch/arm/src/samdl/sam_config.h
@@ -60,7 +60,7 @@
# undef SAMDL_HAVE_USART0
# undef CONFIG_SAMDL_SERCOM0_ISUSART
# undef CONFIG_USART0_SERIAL_CONSOLE
-# undef CONFIG_USART0_FLOW_CONTROL
+# undef CONFIG_USART0_FLOWCONTROL
# undef CONFIG_USART0_IRDAMODE
# undef CONFIG_USART0_RS485MODE
#endif
@@ -70,7 +70,7 @@
# undef SAMDL_HAVE_USART1
# undef CONFIG_SAMDL_SERCOM1_ISUSART
# undef CONFIG_USART1_SERIAL_CONSOLE
-# undef CONFIG_USART1_FLOW_CONTROL
+# undef CONFIG_USART1_FLOWCONTROL
# undef CONFIG_USART1_IRDAMODE
# undef CONFIG_USART1_RS485MODE
#endif
@@ -80,7 +80,7 @@
# undef SAMDL_HAVE_USART2
# undef CONFIG_SAMDL_SERCOM2_ISUSART
# undef CONFIG_USART2_SERIAL_CONSOLE
-# undef CONFIG_USART2_FLOW_CONTROL
+# undef CONFIG_USART2_FLOWCONTROL
# undef CONFIG_USART2_IRDAMODE
# undef CONFIG_USART2_RS485MODE
#endif
@@ -90,7 +90,7 @@
# undef SAMDL_HAVE_USART3
# undef CONFIG_SAMDL_SERCOM3_ISUSART
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART3_FLOW_CONTROL
+# undef CONFIG_USART3_FLOWCONTROL
# undef CONFIG_USART3_IRDAMODE
# undef CONFIG_USART3_RS485MODE
#endif
@@ -100,7 +100,7 @@
# undef SAMDL_HAVE_USART4
# undef CONFIG_SAMDL_SERCOM4_ISUSART
# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART4_FLOW_CONTROL
+# undef CONFIG_USART4_FLOWCONTROL
# undef CONFIG_USART4_IRDAMODE
# undef CONFIG_USART4_RS485MODE
#endif
@@ -110,7 +110,7 @@
# undef SAMDL_HAVE_USART5
# undef CONFIG_SAMDL_SERCOM5_ISUSART
# undef CONFIG_USART5_SERIAL_CONSOLE
-# undef CONFIG_USART5_FLOW_CONTROL
+# undef CONFIG_USART5_FLOWCONTROL
# undef CONFIG_USART5_IRDAMODE
# undef CONFIG_USART5_RS485MODE
#endif
diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt
index 8d30ac2d81..8303c02412 100644
--- a/configs/arduino-due/README.txt
+++ b/configs/arduino-due/README.txt
@@ -115,7 +115,7 @@ Rev 2 vs. Rev 3
(see include/board.h). That fix as well as any others that we may find
will be enabled by selecting
- CONFIG_ADRUINO_DUE_REV3=y
+ CONFIG_ARDUINO_DUE_REV3=y
ITEAD 2.4" TFT with Touch
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/configs/arduino-due/include/board.h b/configs/arduino-due/include/board.h
index 462dd5904f..f486b7ab21 100644
--- a/configs/arduino-due/include/board.h
+++ b/configs/arduino-due/include/board.h
@@ -200,7 +200,7 @@
/* GPIO pin configurations **********************************************************/
-#if 1 /* #ifdef CONFIG_ADRUINO_DUE_REV3 works with REV2 as well */
+#if 1 /* #ifdef CONFIG_ARDUINO_DUE_REV3 works with REV2 as well */
/* This port was performed on the Arduino Due Rev 2 board. A NuttX user reported
* issues with the serial port on his Aduino Due Rev 3 board. That problem was
* resolved as follows:
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index 7b93dc280e..3ed69a2654 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -590,7 +590,7 @@ Where is one of the following:
microSD Yes (5) Yes (5)
Support
----------- ----------------------- --------------------------------
- FAT FS CONFIG_FAT_LCNAME=y CONFIG_FAT_LCNAME=y
+ FAT FS CONFIG_FAT_LCNAMES=y CONFIG_FAT_LCNAMES=y
Config CONFIG_FAT_LFN=n CONFIG_FAT_LFN=y (3)
----------- ----------------------- --------------------------------
LCD Driver No Yes
diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt
index ab878ab5ee..0e34adcc40 100644
--- a/configs/mbed/README.txt
+++ b/configs/mbed/README.txt
@@ -423,7 +423,7 @@ USB Host Configuration
Device Drivers -> USB Host Driver Support
CONFIG_USBHOST=y : USB host support
- CONFIG_USBHOST_ISCO_DISABLE=y : Not needed
+ CONFIG_USBHOST_ISOC_DISABLE=y : Not needed
CONFIG_USBHOST_MSC=y : Mass storage class support
Library Routines
diff --git a/configs/olimex-lpc-h3131/README.txt b/configs/olimex-lpc-h3131/README.txt
index 2999f6e960..c1970fd009 100644
--- a/configs/olimex-lpc-h3131/README.txt
+++ b/configs/olimex-lpc-h3131/README.txt
@@ -548,7 +548,7 @@ Configurations
Here are the relevant current settings:
Build Setup:
- CONFIG_HOST_WINDOS=y : Microsoft Windows
+ CONFIG_HOST_WINDOWS=y : Microsoft Windows
CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment
System Type -> Toolchain:
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index d9532bad9d..bf1f2dd241 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -116,8 +116,8 @@ CONFIG_LPC2378_CODE_BASE=0x00000000
CONFIG_LPC2378_PLL_SETUP=y
CONFIG_LPC2378_PLL_CLKSRC=1
CONFIG_LPC2378_MAM_SETUP=y
-CONFIG_LPC2378_LPC2378_MAMCR_VALUE=1
-CONFIG_LPC2378_LPC2378_MAMTIM_VALUE=3
+CONFIG_LPC2378_MAMCR_VALUE=1
+CONFIG_LPC2378_MAMTIM_VALUE=3
#
# LPC2378 Peripheral Support
diff --git a/configs/pcduino-a10/README.txt b/configs/pcduino-a10/README.txt
index f83b743c6f..4a0e27583d 100644
--- a/configs/pcduino-a10/README.txt
+++ b/configs/pcduino-a10/README.txt
@@ -363,7 +363,7 @@ Configurations
Here are the relevant current settings:
Build Setup:
- CONFIG_HOST_WINDOS=y : Microsoft Windows
+ CONFIG_HOST_WINDOWS=y : Microsoft Windows
CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment
System Type -> Toolchain:
diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index feed619881..c2a13f115b 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -774,7 +774,7 @@ static int sam_getpower(struct lcd_dev_s *dev)
* Name: sam_setpower
*
* Description:
- * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWERL: full on). On
+ * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on). On
* backlit LCDs, this setting may correspond to the backlight setting.
*
* LCD backlight is made of 4 white chip LEDs in parallel, driven by an AAT3194 charge
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index d752c665a5..1d1cdfbf2c 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -176,19 +176,19 @@
/* Check orientation */
#if defined(CONFIG_LCD_LANDSCAPE)
-# if defined(CONFIG_LCD_PORTAIT) || defined(CONFIG_LCD_RPORTAIT) || \
+# if defined(CONFIG_LCD_PORTRAIT) || defined(CONFIG_LCD_RPORTRAIT) || \
defined(CONFIG_LCD_RLANDSCAPE)
# error "Cannot define both portrait and any other orientations"
# endif
#elif defined(CONFIG_LCD_RLANDSCAPE)
-# if defined(CONFIG_LCD_PORTAIT) || defined(CONFIG_LCD_RPORTAIT)
+# if defined(CONFIG_LCD_PORTRAIT) || defined(CONFIG_LCD_RPORTRAIT)
# error "Cannot define both rportrait and any other orientations"
# endif
-#elif defined(CONFIG_LCD_PORTAIT)
-# ifdef CONFIG_LCD_RPORTAIT
+#elif defined(CONFIG_LCD_PORTRAIT)
+# ifdef CONFIG_LCD_RPORTRAIT
# error "Cannot define both landscape and any other orientations"
# endif
-#elif !defined(CONFIG_LCD_RPORTAIT)
+#elif !defined(CONFIG_LCD_RPORTRAIT)
# define CONFIG_LCD_LANDSCAPE 1
#endif
diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt
index 00a1ee3809..41b7f27f04 100644
--- a/configs/sama5d3-xplained/README.txt
+++ b/configs/sama5d3-xplained/README.txt
@@ -1671,7 +1671,7 @@ SDRAM Support
System Type->Heap Configuration
CONFIG_SAMA5_ISRAM_HEAP=n : These do not apply in this case
- CONFIG_SAMA5_DCRS_HEAP=n
+ CONFIG_SAMA5_DDRCS_HEAP=n
System Type->Boot Memory Configuration
CONFIG_RAM_START=0x20000000 : Physical address of SDRAM
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index dfc2cc3638..596007d939 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1874,7 +1874,7 @@ SDRAM Support
System Type->Heap Configuration
CONFIG_SAMA5_ISRAM_HEAP=n : These do not apply in this case
- CONFIG_SAMA5_DCRS_HEAP=n
+ CONFIG_SAMA5_DDRCS_HEAP=n
System Type->Boot Memory Configuration
CONFIG_RAM_START=0x20000000 : Physical address of SDRAM
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index ab31aa1d5a..8b6ed20ffb 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -2223,7 +2223,7 @@ SDRAM Support
System Type->Heap Configuration
CONFIG_SAMA5_ISRAM_HEAP=n : These do not apply in this case
- CONFIG_SAMA5_DCRS_HEAP=n
+ CONFIG_SAMA5_DDRCS_HEAP=n
System Type->Boot Memory Configuration
CONFIG_RAM_START=0x20000000 : Physical address of SDRAM
@@ -4139,7 +4139,7 @@ Configurations
this, the board logic supports these special configurations:
Board Selection ->
- CONFIG_SAMA5D4EK_HSMCI0_AMOUNT=y
+ CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT=y
CONFIG_SAMA5D4EK_HSMCI0_MOUNT_BLKDEV="/dev/mmcsd0"
CONFIG_SAMA5D4EK_HSMCI0_MOUNT_FSTYPE="vfat"
CONFIG_SAMA5D4EK_HSMCI0_MOUNT_MOUNTPOINT="/bin"
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index 06dd8fe705..294b2fdf88 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -181,19 +181,19 @@
/* Check orientation */
#if defined(CONFIG_LCD_LANDSCAPE)
-# if defined(CONFIG_LCD_PORTAIT) || defined(CONFIG_LCD_RPORTAIT) || \
+# if defined(CONFIG_LCD_PORTRAIT) || defined(CONFIG_LCD_RPORTRAIT) || \
defined(CONFIG_LCD_RLANDSCAPE)
# error "Cannot define both portrait and any other orientations"
# endif
#elif defined(CONFIG_LCD_RLANDSCAPE)
-# if defined(CONFIG_LCD_PORTAIT) || defined(CONFIG_LCD_RPORTAIT)
+# if defined(CONFIG_LCD_PORTRAIT) || defined(CONFIG_LCD_RPORTRAIT)
# error "Cannot define both rportrait and any other orientations"
# endif
-#elif defined(CONFIG_LCD_PORTAIT)
-# ifdef CONFIG_LCD_RPORTAIT
+#elif defined(CONFIG_LCD_PORTRAIT)
+# ifdef CONFIG_LCD_RPORTRAIT
# error "Cannot define both landscape and any other orientations"
# endif
-#elif !defined(CONFIG_LCD_RPORTAIT)
+#elif !defined(CONFIG_LCD_RPORTRAIT)
# define CONFIG_LCD_LANDSCAPE 1
#endif
diff --git a/configs/sim/README.txt b/configs/sim/README.txt
index aaeba1c1da..f3803ef290 100644
--- a/configs/sim/README.txt
+++ b/configs/sim/README.txt
@@ -201,7 +201,7 @@ BASIC
Enable the BASIC interpreter. Other default options should be okay:
CONFIG_INTERPRETERS_BAS=y : Enables the interpreter
- CONFIG_INTERPREPTER_BAS_VT100=y
+ CONFIG_INTERPRETER_BAS_VT100=y
The BASIC test suite can be included:
CONFIG_FS_ROMFS=y : ROMFS support is needed
@@ -309,7 +309,7 @@ cxxtest
how to install uClibc++
2. At present (2012/11/02), exceptions are disabled in this example
- CONFIG_UCLIBCXX_EXCEPTIONS=n). It is probably not necessary to
+ CONFIG_UCLIBCXX_EXCEPTION=n). It is probably not necessary to
disable exceptions.
3. Unfortunately, this example will not run now.
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index e8de91eac6..48513db00e 100644
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -749,7 +749,7 @@ Where is one of the following:
microSD Yes Yes
Support
----------- ----------------------- --------------------------------
- FAT FS CONFIG_FAT_LCNAME=y CONFIG_FAT_LCNAME=y
+ FAT FS CONFIG_FAT_LCNAMES=y CONFIG_FAT_LCNAMES=y
Config CONFIG_FAT_LFN=n CONFIG_FAT_LFN=y (4)
----------- ----------------------- --------------------------------
Support for No Yes
diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt
index 110adf13e9..b21062e2dc 100644
--- a/configs/stm3220g-eval/README.txt
+++ b/configs/stm3220g-eval/README.txt
@@ -917,7 +917,7 @@ Where is one of the following:
must be manually enabled by selecting:
CONFIG_CAN=y : Enable the generic CAN infrastructure
- CONFIG_CAN_EXID=y or n : Enable to support extended ID frames
+ CONFIG_CAN_EXTID=y or n : Enable to support extended ID frames
CONFIG_STM32_CAN1=y : Enable CAN1
CONFIG_CAN_LOOPBACK=y : Enable CAN loopback mode
diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt
index 00a469aae2..ad137d600c 100644
--- a/configs/stm3240g-eval/README.txt
+++ b/configs/stm3240g-eval/README.txt
@@ -1177,7 +1177,7 @@ Where is one of the following:
must be manually enabled by selecting:
CONFIG_CAN=y : Enable the generic CAN infrastructure
- CONFIG_CAN_EXID=y or n : Enable to support extended ID frames
+ CONFIG_CAN_EXTID=y or n : Enable to support extended ID frames
CONFIG_STM32_CAN1=y : Enable CAN1
CONFIG_CAN_LOOPBACK=y : Enable CAN loopback mode
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index 10979e2604..0d9a4df30f 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1075,7 +1075,7 @@ BASIC
Enable the BASIC interpreter. Other default options should be okay:
CONFIG_INTERPRETERS_BAS=y : Enables the interpreter
- CONFIG_INTERPREPTER_BAS_VT100=y
+ CONFIG_INTERPRETER_BAS_VT100=y
The BASIC test suite can be included:
CONFIG_FS_ROMFS=y : ROMFS support is needed
@@ -1214,7 +1214,7 @@ Where is one of the following:
arm-none-eabi-ar.exe rcs libsupc++.a vterminate.o
- 4. Exceptions are enabled and workking (CONFIG_UCLIBCXX_EXCEPTIONS=y)
+ 4. Exceptions are enabled and workking (CONFIG_UCLIBCXX_EXCEPTION=y)
elf:
---
diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c
index 0ecab35402..6ed06f3891 100644
--- a/fs/procfs/fs_procfs.c
+++ b/fs/procfs/fs_procfs.c
@@ -121,7 +121,7 @@ static const struct procfs_entry_s g_procfsentries[] =
{ "mtd", &mtd_procfsoperations },
#endif
-#if defined(CONFIG_MTD_PARTITION) && !defined(CONFIG_FS_PROCFS_EXCLUDE_PARTITON)
+#if defined(CONFIG_MTD_PARTITION) && !defined(CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS)
{ "partitions", &part_procfsoperations },
#endif
diff --git a/graphics/README.txt b/graphics/README.txt
index 1c0488d877..ab24d090d6 100644
--- a/graphics/README.txt
+++ b/graphics/README.txt
@@ -399,7 +399,7 @@ CONFIG_NXTERM_NXKBDIN
the interface nxterm_kdbin() is enabled. That interface may be driven
by window callback functions so that keyboard input *only* goes to the
top window.
-CONFIG__NXTERM_KBDBUFSIZE
+CONFIG_NXTERM_KBDBUFSIZE
If CONFIG_NXTERM_NXKBDIN is enabled, then this value may be used to
define the size of the per-window keyboard input buffer. Default: 16
CONFIG_NXTERM_NPOLLWAITERS
diff --git a/include/cxx/cstdlib b/include/cxx/cstdlib
index d7167d2e4c..790996a8ea 100644
--- a/include/cxx/cstdlib
+++ b/include/cxx/cstdlib
@@ -56,7 +56,7 @@ namespace std
// Environment variable support
-#ifndef CONFIG_DISABLE_ENIVRON
+#ifndef CONFIG_DISABLE_ENVIRON
using ::get_environ_ptr;
using ::getenv;
using ::putenv;
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index f010bfc26b..51ef97a460 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -217,7 +217,7 @@ void net_initialize(void);
/****************************************************************************
* Critical section management. The NuttX configuration setting
- * CONFIG_NET_NOINT indicates that uIP not called from the interrupt level.
+ * CONFIG_NET_NOINTS indicates that uIP not called from the interrupt level.
* If CONFIG_NET_NOINTS is defined, then these will map to semaphore
* controls. Otherwise, it assumed that uIP will be called from interrupt
* level handling and these will map to interrupt enable/disable controls.
diff --git a/include/stdlib.h b/include/stdlib.h
index 90b9db4183..d7319b98fb 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -76,7 +76,7 @@
* can be used in its place.
*/
-#ifndef CONFIG_DISABLE_ENIVRON
+#ifndef CONFIG_DISABLE_ENVIRON
# define environ get_environ_ptr()
#endif
@@ -120,7 +120,7 @@ int rand(void);
/* Environment variable support */
-#ifndef CONFIG_DISABLE_ENIVRON
+#ifndef CONFIG_DISABLE_ENVIRON
FAR char **get_environ_ptr( void );
FAR char *getenv(FAR const char *name);
int putenv(FAR const char *string);
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index b76fd60532..7d9dccd4a5 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -362,7 +362,7 @@
# define SYS_pthread_setspecific (__SYS_pthread+26)
# define SYS_pthread_yield (__SYS_pthread+27)
-# ifndef CONFIG_DISABLE_SIGNAL
+# ifndef CONFIG_DISABLE_SIGNALS
# define SYS_pthread_cond_timedwait (__SYS_pthread+28)
# define SYS_pthread_kill (__SYS_pthread+29)
# define SYS_pthread_sigmask (__SYS_pthread+30)
diff --git a/sched/signal/sig_action.c b/sched/signal/sig_action.c
index 090144b2b6..4d0f845875 100644
--- a/sched/signal/sig_action.c
+++ b/sched/signal/sig_action.c
@@ -158,7 +158,7 @@ static FAR sigactq_t *sig_allocateaction(void)
* - There are no default actions so the special value SIG_DFL is treated
* like SIG_IGN.
* - All sa_flags in struct sigaction of act input are ignored (all
- * treated like SA_SIGINFO). The one exception is if CONFIG_SCHED_CHILDSTATUS
+ * treated like SA_SIGINFO). The one exception is if CONFIG_SCHED_CHILD_STATUS
* is defined; then SA_NOCLDWAIT is supported but only for SIGCHLD
*
****************************************************************************/
diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h
index 14584afd0a..86b71cdcb3 100644
--- a/syscall/syscall_lookup.h
+++ b/syscall/syscall_lookup.h
@@ -266,7 +266,7 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert)
SYSCALL_LOOKUP(pthread_setschedprio, 2, STUB_pthread_setschedprio)
SYSCALL_LOOKUP(pthread_setspecific, 2, STUB_pthread_setspecific)
SYSCALL_LOOKUP(pthread_yield, 0, STUB_pthread_yield)
-# ifndef CONFIG_DISABLE_SIGNAL
+# ifndef CONFIG_DISABLE_SIGNALS
SYSCALL_LOOKUP(pthread_cond_timedwait, 3, STUB_pthread_cond_timedwait)
SYSCALL_LOOKUP(pthread_kill, 2, STUB_pthread_kill)
SYSCALL_LOOKUP(pthread_sigmask, 3, STUB_pthread_sigmask)