diff --git a/arch/sim/src/nuttx-names.in b/arch/sim/src/nuttx-names.in index d2e079446f..0edb3d27e4 100644 --- a/arch/sim/src/nuttx-names.in +++ b/arch/sim/src/nuttx-names.in @@ -95,14 +95,18 @@ NXSYMBOLS(pthread_cond_init) NXSYMBOLS(pthread_cond_signal) NXSYMBOLS(pthread_cond_wait) NXSYMBOLS(pthread_create) +#if CONFIG_TLS_NELEM > 0 NXSYMBOLS(pthread_getspecific) NXSYMBOLS(pthread_key_create) +#endif NXSYMBOLS(pthread_kill) NXSYMBOLS(pthread_mutex_destroy) NXSYMBOLS(pthread_mutex_init) NXSYMBOLS(pthread_mutex_lock) NXSYMBOLS(pthread_mutex_unlock) +#if CONFIG_TLS_NELEM > 0 NXSYMBOLS(pthread_setspecific) +#endif NXSYMBOLS(pthread_sigmask) NXSYMBOLS(puts) NXSYMBOLS(read) diff --git a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig index 6fc2593e01..230c687f4d 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig @@ -164,3 +164,4 @@ CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TEE=y CONFIG_TEENSY_41=y CONFIG_TEENSY_41_PIKRON_BB=y +CONFIG_TLS_NELEM=4 diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig index 299c4b6b21..6aecfad6ba 100644 --- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig @@ -51,5 +51,4 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig index c64c1cbad2..ae7755aaad 100644 --- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig @@ -51,5 +51,4 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig index 4856c67131..4d8ed3d3ec 100644 --- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig +++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig @@ -61,5 +61,4 @@ CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2015 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig index b20d2f21b8..9bc52c1089 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig @@ -164,6 +164,7 @@ CONFIG_SYSTEM_SETLOGMASK=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TEE=y CONFIG_SYSTEM_TELNET_CLIENT=y +CONFIG_TLS_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USBDEV_COMPOSITE=y CONFIG_USBHOST_COMPOSITE=y diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt index 2b1a411c86..f2ec6292eb 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt @@ -785,7 +785,6 @@ Configurations CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_MQ_MAXMSGSIZE=0 - CONFIG_TLS_NELEM=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_MQ_MSGS=0 diff --git a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig index 16c733de29..f929153e53 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig +++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig @@ -47,7 +47,6 @@ CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 diff --git a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig index 2d288daa65..111813de55 100644 --- a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig +++ b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig @@ -44,4 +44,3 @@ CONFIG_START_YEAR=2013 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 diff --git a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig index aa616d6145..3a6c2f8dfb 100644 --- a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig +++ b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig @@ -73,4 +73,3 @@ CONFIG_START_YEAR=2013 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 diff --git a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig index 7f8db4bea3..e9e457365f 100644 --- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig @@ -49,4 +49,3 @@ CONFIG_START_YEAR=2021 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 diff --git a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig index d573d126ea..04e78a12f1 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig @@ -69,5 +69,4 @@ CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig index 5bacfa2667..273a5be100 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig @@ -51,5 +51,4 @@ CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig index 0b72171359..bb344630da 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig @@ -99,7 +99,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 -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/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index d29a161bcb..d685796fbf 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -123,7 +123,6 @@ CONFIG_SYSTEM_COMPOSITE=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 -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 e7444c545c..d433d06f00 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -111,7 +111,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 -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 5ca9fb2d12..853bb05156 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig @@ -74,7 +74,6 @@ CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 -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 42bff22b90..f1b26b52d0 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig @@ -72,7 +72,6 @@ CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=12 -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 560cb7a95d..af316f4b84 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig @@ -61,4 +61,3 @@ CONFIG_STM32_PWR=y CONFIG_STM32_RTC=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig index a947ffba90..d59c29ee33 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig @@ -45,7 +45,6 @@ CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -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 3d55552aaf..1b89c00840 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -57,5 +57,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index 5133abaa9d..6575386d6f 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -50,5 +50,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y 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 20a625d761..be1f6ef589 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -64,5 +64,4 @@ CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_STACKSIZE=1024 CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 2175a346cb..8addb6ad77 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -61,5 +61,4 @@ CONFIG_STM32F0L0G0_SPI1=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index 7c13cae077..94938f59c5 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -56,7 +56,6 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -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 3ad53f383e..bb81531223 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -58,5 +58,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index 0d8c9a2ea7..cce03e64ae 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -61,5 +61,4 @@ CONFIG_STM32F0L0G0_SPI1=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index 99024812e5..5a926182ad 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -107,5 +107,4 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TIMER=y -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index ee6ae0195e..dcc5de9438 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -48,5 +48,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index b955eb3a28..3cf4f87fe7 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -50,5 +50,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index fdaf1bfd51..98f0f8bf47 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -61,5 +61,4 @@ CONFIG_STM32F0L0G0_SPI1=y CONFIG_STM32F0L0G0_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index 495d69c12e..83c587deda 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -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 b33efa3a27..4eec1200ee 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig index 4e5fcc99fb..edf60028b6 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig @@ -53,7 +53,6 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART3=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig index 03e7b0a42d..0b5933eaca 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig @@ -76,7 +76,6 @@ CONFIG_STM32F0L0G0_SPI1_COMMTYPE=1 CONFIG_STM32F0L0G0_USART3=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig index 7ed505fdd3..a3ef7474c4 100644 --- a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig @@ -46,5 +46,4 @@ CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig index 2fd0c6c337..2ad8471be7 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig @@ -59,4 +59,5 @@ CONFIG_STM32_ROMFS=y CONFIG_STM32_ROMFS_IMAGEFILE="../../apps/examples/elf/tests/romfs.img" CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TLS_NELEM=4 CONFIG_USART3_SERIAL_CONSOLE=y diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig index 3888433b9b..9841d9b14e 100644 --- a/boards/arm/tiva/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -53,5 +53,4 @@ 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 diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig index c41d7a702c..1dde641f2c 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig @@ -40,7 +40,6 @@ CONFIG_START_MONTH=7 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TLS_NELEM=0 CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig index cbee30006d..5ad3bdb1bc 100644 --- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig +++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig @@ -36,4 +36,3 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2009 CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y -CONFIG_TLS_NELEM=0 diff --git a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig index 1717ebf076..3796876907 100644 --- a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig @@ -77,6 +77,7 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y +CONFIG_TLS_NELEM=4 CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/c906/smartl-c906/configs/elf/defconfig b/boards/risc-v/c906/smartl-c906/configs/elf/defconfig index bb1f3c3097..db38c17378 100644 --- a/boards/risc-v/c906/smartl-c906/configs/elf/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/elf/defconfig @@ -64,4 +64,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y +CONFIG_TLS_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig index ebb853b0bd..70ab9856e1 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig @@ -54,4 +54,5 @@ CONFIG_START_YEAR=2020 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 +CONFIG_TLS_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig index 56f43965c1..e6367feb28 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig @@ -61,4 +61,5 @@ CONFIG_START_YEAR=2011 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_BUFFER=y CONFIG_SYSTEM_NSH=y +CONFIG_TLS_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index 5fe1851e79..f76d32c0ee 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -45,7 +45,6 @@ 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 f4459da843..8b309470b9 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig @@ -45,7 +45,6 @@ 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/nuttx/tls.h b/include/nuttx/tls.h index 748403b193..69b750885d 100644 --- a/include/nuttx/tls.h +++ b/include/nuttx/tls.h @@ -90,9 +90,6 @@ extern "C" # else typedef uint8_t tls_ndxset_t; # endif - -typedef CODE void (*tls_dtor_t)(FAR void *); - #endif #if CONFIG_TLS_TASK_NELEM > 0 @@ -109,6 +106,8 @@ typedef CODE void (*tls_dtor_t)(FAR void *); # endif #endif +typedef CODE void (*tls_dtor_t)(FAR void *); + /* This structure encapsulates all variables associated with getopt(). */ struct getopt_s @@ -225,7 +224,7 @@ struct tls_info_s #if CONFIG_TLS_TASK_NELEM > 0 /**************************************************************************** - * Name: task_tls_allocs + * Name: task_tls_alloc * * Description: * Allocate a global-unique task local storage data index diff --git a/libs/libc/tls/Kconfig b/libs/libc/tls/Kconfig index a67e6511d5..62b16ca078 100644 --- a/libs/libc/tls/Kconfig +++ b/libs/libc/tls/Kconfig @@ -44,7 +44,7 @@ config TLS_LOG2_MAXSTACK config TLS_NELEM int "Number of TLS elements" - default 4 + default 0 range 0 64 ---help--- The number of unique TLS elements. These can be accessed with