boards/xxx: Remove CONFIG_SCHED_ATEXIT/ONEXIT from all defconfigs

apache · May 24, 2022 · b577187 · b577187
1 parent abf9ed1
commit b577187
Show file tree

Hide file tree

Showing 88 changed files with 87 additions and 120 deletions.
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
@@ -84,10 +84,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_SCHED_ONEXIT
-#  error "on_exit() API must be enabled for deallocating Wi-Fi resources"
-#endif
-
 #define PHY_RF_MASK   ((1 << PHY_BT_MODULE) | (1 << PHY_WIFI_MODULE))
 
 #ifdef CONFIG_ESP32C3_WIFI_SAVE_PARAM

diff --git a/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig b/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig
@@ -38,6 +38,7 @@ CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBCXX=y
 CONFIG_LIBCXXABI=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
@@ -51,7 +52,6 @@ CONFIG_RAM_VSTART=0x10000000
 CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
 CONFIG_SCHED_WAITPID=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
@@ -64,6 +64,7 @@ CONFIG_LC823450_UART0=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -103,11 +104,8 @@ CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RTC=y
 CONFIG_RTC_HIRES=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SERIAL_TERMIOS=y
 CONFIG_SMP=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@@ -67,6 +67,7 @@ CONFIG_LC823450_XGEVK_BTPOWER=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
@@ -123,13 +124,10 @@ CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RR_INTERVAL=200
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=60
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SENSORS=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
@@ -35,6 +35,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LC823450_UART0=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=255
@@ -51,13 +52,10 @@ CONFIG_RAM_START=0x02001000
 CONFIG_RAW_BINARY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
@@ -34,6 +34,7 @@ CONFIG_LC823450_MTD=y
 CONFIG_LC823450_SDIF_SDC=y
 CONFIG_LC823450_UART0=y
 CONFIG_LC823450_UART1=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MTD=y
@@ -50,13 +51,10 @@ CONFIG_RAM_START=0x02001000
 CONFIG_RAW_BINARY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SENSORS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
@@ -47,6 +47,7 @@ CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -93,13 +94,10 @@ CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
@@ -77,6 +77,7 @@ CONFIG_LCD_ST7565=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -144,7 +145,6 @@ CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RNDIS=y
 CONFIG_RTC=y
 CONFIG_RTC_HIRES=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
@@ -154,8 +154,6 @@ CONFIG_SCHED_INSTRUMENTATION_PREEMPTION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=60
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SENSORS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
@@ -52,6 +52,7 @@ CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -97,11 +98,8 @@ CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
@@ -34,6 +34,7 @@ CONFIG_LC823450_UART0=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=255
@@ -50,13 +51,10 @@ CONFIG_RAM_START=0x02001000
 CONFIG_RAW_BINARY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@@ -74,6 +74,7 @@ CONFIG_LCD_ST7565=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -146,15 +147,12 @@ CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RNDIS=y
 CONFIG_RTC=y
 CONFIG_RTC_HIRES=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=60
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SENSORS=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
@@ -60,6 +60,7 @@ CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
 CONFIG_LIBC_KBDCODEC=y
+CONFIG_LIBC_MAX_EXITFUNS=32
 CONFIG_LIBM=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
@@ -99,11 +100,8 @@ CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
-CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=32
 CONFIG_SCHED_STARTHOOK=y
 CONFIG_SENSORS=y
 CONFIG_SERIAL_TERMIOS=y

diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
@@ -32,6 +32,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INIT_ENTRYPOINT="nxwm_main"
 CONFIG_INPUT=y
 CONFIG_INPUT_FT5X06=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
@@ -91,7 +92,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=18
 CONFIG_START_MONTH=12

diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
@@ -34,6 +34,7 @@ CONFIG_EXAMPLES_PWFB_TBCOLOR=0xad55
 CONFIG_FS_PROCFS=y
 CONFIG_INIT_ENTRYPOINT="pwfb_main"
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
@@ -62,7 +63,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=19
 CONFIG_START_MONTH=3

diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
@@ -25,6 +25,7 @@ CONFIG_EXAMPLES_PWLINES_BPP=16
 CONFIG_FS_PROCFS=y
 CONFIG_INIT_ENTRYPOINT="pwlines_main"
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
@@ -55,7 +56,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=19
 CONFIG_START_MONTH=3

diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
@@ -33,6 +33,7 @@ CONFIG_INIT_ENTRYPOINT="twm4nx_main"
 CONFIG_INPUT=y
 CONFIG_INPUT_FT5X06=y
 CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
@@ -87,7 +88,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=4
 CONFIG_START_MONTH=5

diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
@@ -33,6 +33,7 @@ CONFIG_INIT_ENTRYPOINT="twm4nx_main"
 CONFIG_INPUT=y
 CONFIG_INPUT_FT5X06=y
 CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
@@ -88,7 +89,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=4
 CONFIG_START_MONTH=5

diff --git a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
@@ -36,6 +36,7 @@ CONFIG_INPUT_ADS7843E=y
 CONFIG_LCD=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=31
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NSH_ARCHINIT=y
@@ -85,7 +86,6 @@ CONFIG_SAM34_GPIO_IRQ=y
 CONFIG_SAM34_SPI0=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=28
 CONFIG_START_MONTH=6

diff --git a/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
@@ -41,6 +41,7 @@ CONFIG_LCD=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=64
 CONFIG_LIBC_FLOATINGPOINT=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBM=y
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
@@ -131,7 +132,6 @@ CONFIG_SAM4EEK_LCD_BGCOLOR=0x95fa
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=10
 CONFIG_START_MONTH=3

diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
@@ -31,6 +31,7 @@ CONFIG_INIT_ENTRYPOINT="nxwm_main"
 CONFIG_INIT_STACKSIZE=1024
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_FLOATINGPOINT=y
+CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBM=y
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
@@ -112,7 +113,6 @@ CONFIG_SAMA5_TSD_SWAPXY=y
 CONFIG_SAMA5_USART1=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_DAY=13
 CONFIG_START_MONTH=10

diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig
@@ -48,6 +48,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_MAX_EXITFUNS=2
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
 CONFIG_MMCSD_SDIO=y
@@ -78,8 +79,6 @@ CONFIG_SAMA5_XDMAC0=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_ONEXIT=y
-CONFIG_SCHED_ONEXIT_MAX=2
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_SYSTEM_NSH=y