diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig index 9f51239a961..06ba2256e5a 100644 --- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_MM_SMALL=y CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y @@ -64,6 +63,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig index 7fc54d36958..1dc483a7373 100644 --- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_MM_SMALL=y CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y @@ -64,6 +63,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig index 16412c9c83e..37bbee0ee1a 100644 --- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig +++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig @@ -49,7 +49,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y @@ -76,6 +75,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig index a94389ceb0c..efcaa10148b 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig +++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_MKDIR=y @@ -61,6 +60,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 diff --git a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig index 07da75c81ed..7b3450b08f5 100644 --- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_MM_SMALL=y CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y @@ -62,6 +61,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig index bb70df50238..5f403dabc8c 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=64 @@ -56,6 +55,7 @@ CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index a52b95a6b91..d2fd684c64f 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -79,7 +79,6 @@ CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_CODECS_BUFSIZE=0 @@ -132,6 +131,7 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig index d28b000a321..f736cbeb321 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -67,7 +67,6 @@ CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_CODECS_BUFSIZE=0 @@ -118,6 +117,7 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig index 644788c8267..9d14e13400f 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig @@ -43,7 +43,6 @@ CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_CODECS_BUFSIZE=0 @@ -96,6 +95,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig index 1ccd1ed7df9..d8cecb0e156 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig @@ -44,7 +44,6 @@ CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 -CONFIG_TLS_NELEM=0 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=2 @@ -80,6 +79,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig index 1e8d2df4f23..84d62b5e3cc 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig @@ -40,7 +40,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CD=y @@ -74,6 +73,7 @@ CONFIG_STM32_RTC=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig index 670d816d10c..c5337e0916f 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_MKDIR=y @@ -60,6 +59,7 @@ CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART1_BAUD=57600 CONFIG_USART1_RXBUFSIZE=64 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index b9d49d2c98f..353524c5c59 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -32,7 +32,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 @@ -61,6 +60,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index 15ae1786d6d..191f5967160 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=64 @@ -54,6 +53,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 4064a799e96..ad68646de04 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -35,7 +35,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 @@ -66,6 +65,7 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_STACKSIZE=1024 CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 2b4609c2094..fba831fb19f 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 @@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index 5b05a6296d5..d12c3f2b2d5 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CP=y @@ -60,6 +59,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_RXBUFSIZE=32 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=32 diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index 074295a6312..ec72e8d2034 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_CP=y @@ -62,6 +61,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index 487f332eda8..d5877b2c68c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -36,7 +36,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 @@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index 810f90d5010..e0a368a7681 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=64 @@ -109,6 +108,7 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_TIMER=y +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index 7ead6a70bd7..b35407bf5dc 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=64 @@ -52,6 +51,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index 7367ad9004c..d2229d4429e 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=64 @@ -54,6 +53,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index 03666111dd3..397479b924c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=64 @@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index 0a2d756e915..cca0e941d5f 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_MKDIR=y @@ -56,6 +55,7 @@ CONFIG_STM32F0L0G0_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig index d310dda40f9..bdb545f543e 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_MKDIR=y @@ -56,6 +55,7 @@ CONFIG_STM32F0L0G0_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 +CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig index a0984c12a47..e49ffc089d5 100644 --- a/boards/arm/tiva/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -34,7 +34,6 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_TLS_NELEM=0 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_WDOGS=8 @@ -60,6 +59,7 @@ CONFIG_TIVA_GPIOF_IRQS=y CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y +CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="webserver_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig index 32395f8f76f..09d7f04b54f 100644 --- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig +++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig @@ -15,8 +15,8 @@ CONFIG_ARCH_INTERRUPTSTACK=128 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16945 -CONFIG_DEFAULT_SMALL=y CONFIG_CONSOLE_SYSLOG=y +CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_ENDIAN_BIG=y @@ -26,7 +26,6 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_TLS_NELEM=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 CONFIG_PREALLOC_WDOGS=8 @@ -43,6 +42,7 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2009 CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y +CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=256 CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index a1fab702857..0abc5c080b6 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -37,7 +37,6 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_TLS_NELEM=0 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_WDOGS=8 @@ -50,6 +49,7 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2009 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TLS_NELEM=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig index af52e22bd55..a257a9922d6 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig @@ -35,7 +35,6 @@ CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_TLS_NELEM=0 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 @@ -49,6 +48,7 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2009 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TLS_NELEM=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 diff --git a/include/sys/syscall_lookup.h b/include/sys/syscall_lookup.h index 3da60f042f1..9d7a827cd28 100644 --- a/include/sys/syscall_lookup.h +++ b/include/sys/syscall_lookup.h @@ -283,8 +283,10 @@ SYSCALL_LOOKUP(telldir, 1) SYSCALL_LOOKUP(shmdt, 1) #endif +#if CONFIG_TLS_NELEM > 0 SYSCALL_LOOKUP(tls_alloc, 0) SYSCALL_LOOKUP(tls_free, 1) +#endif /* The following are defined if pthreads are enabled */ diff --git a/sched/Kconfig b/sched/Kconfig index 9367a59bf35..1876c1d5a02 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -642,17 +642,7 @@ config SCHED_USER_IDENTITY endmenu # Tasks and Scheduling menu "Pthread Options" - -config NPTHREAD_KEYS - int "Maximum number of pthread keys" - default 4 if !DISABLE_PTHREAD - default 0 if DISABLE_PTHREAD - range 0 32 - ---help--- - The number of items of thread-specific data that can be retained. - The value zero disables support for pthread-specific data. - -if !DISABLE_PTHREAD + depends on !DISABLE_PTHREAD config PTHREAD_MUTEX_TYPES bool "Enable mutex types" @@ -732,8 +722,6 @@ config CANCELLATION_POINTS cancellation points will also used with the () task_delete() API even if pthreads are not enabled. -endif # !DISABLE_PTHREAD - endmenu # Pthread Options menu "Performance Monitoring" diff --git a/syscall/syscall_funclookup.c b/syscall/syscall_funclookup.c index fea78794b1f..3d7f2c48404 100644 --- a/syscall/syscall_funclookup.c +++ b/syscall/syscall_funclookup.c @@ -1,35 +1,20 @@ /**************************************************************************** * syscall/syscall_funclookup.c * - * Copyright (C) 2011-2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ @@ -47,14 +32,15 @@ #if defined(CONFIG_LIB_SYSCALL) && defined(__KERNEL__) #include -#include -#include -#include #include #include #include #include +#include #include +#include +#include +#include #include #include