You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/07/01 16:41:48 UTC

[incubator-nuttx] branch master updated: boards: Remove the unused CONFIG_xxx_CXXINITIALIZE=y

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 49020ac  boards: Remove the unused CONFIG_xxx_CXXINITIALIZE=y
49020ac is described below

commit 49020acfdc2a846d0d2c8021b83a41ff9e6178c9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jun 30 20:52:39 2020 +0800

    boards: Remove the unused CONFIG_xxx_CXXINITIALIZE=y
    
    since cxx initialization is controlled by CONFIG_HAVE_CXXINITIALIZE now
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: I39438dc3006d0a0b810052ecef50cd3c92f09d83
---
 Documentation/NuttShell.html                                   | 10 ++--------
 boards/arm/a1x/pcduino-a10/configs/nsh/defconfig               |  1 -
 boards/arm/am335x/beaglebone-black/configs/lcd/defconfig       |  1 -
 boards/arm/am335x/beaglebone-black/configs/nsh/defconfig       |  1 -
 boards/arm/cxd56xx/spresense/configs/audio/defconfig           |  1 -
 boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig       |  1 -
 boards/arm/cxd56xx/spresense/configs/camera/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig     |  1 -
 boards/arm/cxd56xx/spresense/configs/lcd/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/lte/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/mpy/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/nsh/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/rndis/defconfig           |  1 -
 boards/arm/cxd56xx/spresense/configs/smp/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/wifi/defconfig            |  1 -
 boards/arm/imx6/sabre-6quad/configs/nsh/defconfig              |  1 -
 boards/arm/imx6/sabre-6quad/configs/smp/defconfig              |  1 -
 boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig    |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig    |  1 -
 boards/arm/kl/freedom-kl25z/src/Makefile                       |  4 ----
 boards/arm/nuc1xx/nutiny-nuc120/src/Makefile                   |  4 ----
 boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig     |  1 -
 .../arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig   |  1 -
 boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig     |  1 -
 .../arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig   |  1 -
 boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig            |  1 -
 boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig            |  1 -
 boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig            |  1 -
 boards/arm/sam34/arduino-due/configs/nsh/defconfig             |  1 -
 boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig        |  1 -
 boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig    |  1 -
 boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig          |  1 -
 boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig      |  1 -
 boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig          |  1 -
 boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig         |  1 -
 boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig            |  1 -
 .../configs/ethernet-over-usb-2-high-speed/defconfig           |  1 -
 boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig        |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig            |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig             |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig        |  1 -
 boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig             |  1 -
 boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig              |  1 -
 boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig          |  1 -
 boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig            |  1 -
 boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig         |  1 -
 boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd5e5/metro-m4/configs/nsh/defconfig              |  1 -
 boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig   |  1 -
 .../samv7/same70-xplained/configs/mrf24j40-starhub/defconfig   |  1 -
 .../arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig   |  1 -
 boards/arm/stm32/clicker2-stm32/README.txt                     |  1 -
 boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig         |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig    |  1 -
 boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig    |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig  |  1 -
 boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig          |  1 -
 boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig       |  1 -
 boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig     |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig          |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig       |  1 -
 boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig        |  1 -
 boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig      |  1 -
 .../stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig   |  1 -
 boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig      |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig     |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig      |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig    |  1 -
 boards/arm/stm32/omnibusf4/configs/nsh/defconfig               |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig   |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig         |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig       |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig    |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig     |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/README.txt                   |  3 +--
 boards/arm/stm32/stm32f4discovery/configs/audio/defconfig      |  1 -
 boards/arm/stm32/stm32f4discovery/configs/canard/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig       |  1 -
 boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/module/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f4discovery/configs/pm/defconfig         |  1 -
 boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig |  1 -
 boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig      |  1 -
 boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig |  1 -
 boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig       |  1 -
 boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig    |  1 -
 boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt                |  1 -
 boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt                |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig    |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig    |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig       |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig     |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig   |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig      |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig   |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig   |  1 -
 boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig   |  1 -
 boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig      |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig         |  1 -
 .../arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig   |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig         |  1 -
 boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig      |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig    |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig    |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig  |  1 -
 boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig      |  1 -
 boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig    |  1 -
 boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig     |  1 -
 boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig    |  1 -
 boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig     |  1 -
 boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig     |  1 -
 boards/xtensa/esp32/esp32-core/configs/nsh/defconfig           |  1 -
 boards/xtensa/esp32/esp32-core/configs/smp/defconfig           |  1 -
 152 files changed, 3 insertions(+), 166 deletions(-)

diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 9be601a..11d53e2 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -4730,19 +4730,14 @@ set FOOBAR ABC_${FOO}_${BAR}
 
 <p>
   The NSH start-up sequence is very simple.
-  As an example, the code at <code>apps/examples/nsh/nsh_main.c</code> illustrates how to start NSH.
+  As an example, the code at <code>apps/system/nsh/nsh_main.c</code> illustrates how to start NSH.
   It simple does the following:
 </p>
 
 <ol>
   <li>
     <p>
-      If you have C++ static initializers, it will call your implementation of <code>up_cxxinitialize()</code> which will, in turn, call those static initializers.
-      For the case of the STM3240G-EVAL board, the implementation of <code>up_cxxinitialize()</code> can be found at <code>nuttx/boards/arm/stm32/stm3240g-eval/src/up_cxxinitialize.c</code>.
-    </p>
-  <li>
-    <p>
-      This function then calls <code>nsh_initialize()</code> which initializes the NSH library.
+      This function calls <code>nsh_initialize()</code> which initializes the NSH library.
       <code>nsh_initialize()</code> is described in more detail below.
     </p>
   <li>
@@ -5993,7 +5988,6 @@ xxd -i romfs_img >nsh_romfsimg.h
   <li><a href="#cmduname"><code>uname</code></a></li>
   <li><a href="#cmdunset"><code>unset</code></a></li>
   <li><a href="#looping"><code>until</code></a></li>
-  <li><a href="#custonshlib"><code>up_cxxinitialize()</code></a></li>
   <li><a href="#cmdurldec"><code>urldecode</code></a></li>
   <li><a href="#cmdurlencode"><code>urlencode</code></a></li>
   <li><a href="#usbstartup">USB console startup</a></li>
diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
index bbb1952..3c4a585 100644
--- a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
+++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_START_MONTH=7
 CONFIG_START_YEAR=2013
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=2
diff --git a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
index 7a77450..8a1300a 100644
--- a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
@@ -53,7 +53,6 @@ CONFIG_START_DAY=8
 CONFIG_START_MONTH=7
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_VIDEO=y
diff --git a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
index c1f061b..3d429bd 100644
--- a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
@@ -51,7 +51,6 @@ CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2015
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=2
diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
index 0e79ec5..33ebcf5 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
@@ -82,7 +82,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
index 4467af4..ccad7cf 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
@@ -81,7 +81,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
index b09ce73..d7bc922 100644
--- a/boards/arm/cxd56xx/spresense/configs/camera/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
@@ -80,7 +80,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
index 1ffed64..07ed23a 100644
--- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
@@ -101,7 +101,6 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
index 68dc234..1d763bd 100644
--- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
@@ -89,7 +89,6 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
index 23386c2..2336d75 100644
--- a/boards/arm/cxd56xx/spresense/configs/lte/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
@@ -78,7 +78,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
index a2dc385..b4cf63c 100644
--- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
@@ -89,7 +89,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
index 89dd4ad..50a5626 100644
--- a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
@@ -55,6 +55,5 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index bbb61a1..9a3636f 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -129,7 +129,6 @@ CONFIG_START_YEAR=2019
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSLOG_TIMESTAMP=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NSH_SYMTAB=y
 CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
 CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
index 96bcff2..be55e31 100644
--- a/boards/arm/cxd56xx/spresense/configs/smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
@@ -60,7 +60,6 @@ CONFIG_START_MONTH=10
 CONFIG_START_YEAR=2019
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SYSTEM=y
 CONFIG_SYSTEM_TASKSET=y
 CONFIG_TESTING_OSTEST=y
diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
index 932ec5f..ea19120 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
@@ -86,7 +86,6 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
index 8fecdf1..85e8dca 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
@@ -77,7 +77,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index 0add538..cb77483 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -131,7 +131,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSLOG_TIMESTAMP=y
 CONFIG_SYSTEM_DHCPC_RENEW=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NSH_SYMTAB=y
 CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
 CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
diff --git a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
index 46db605..b58f20b 100644
--- a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
@@ -53,6 +53,5 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2016
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
index 5d5bdf5..5ef5b34 100644
--- a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
@@ -58,7 +58,6 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2016
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SYSTEM=y
 CONFIG_SYSTEM_TASKSET=y
 CONFIG_TESTING_OSTEST=y
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
index c54b2ac..d863e93 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
@@ -43,5 +43,4 @@ CONFIG_SCHED_CPULOAD=y
 CONFIG_START_DAY=14
 CONFIG_START_MONTH=3
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
index b7933dc..5245b18 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
@@ -43,5 +43,4 @@ CONFIG_SCHED_CPULOAD=y
 CONFIG_START_DAY=14
 CONFIG_START_MONTH=3
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kl/freedom-kl25z/src/Makefile b/boards/arm/kl/freedom-kl25z/src/Makefile
index b84315a..3a50bc8 100644
--- a/boards/arm/kl/freedom-kl25z/src/Makefile
+++ b/boards/arm/kl/freedom-kl25z/src/Makefile
@@ -53,10 +53,6 @@ CSRCS += kl_spi.c
 endif
 endif
 
-ifeq ($(CONFIG_HAVE_CXX),y)
-CSRCS += kl_cxxinitialize.c
-endif
-
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += kl_led.c
 endif
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/src/Makefile b/boards/arm/nuc1xx/nutiny-nuc120/src/Makefile
index f60eb2d..3c1fb8a 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/src/Makefile
+++ b/boards/arm/nuc1xx/nutiny-nuc120/src/Makefile
@@ -37,10 +37,6 @@ include $(TOPDIR)/Make.defs
 
 CSRCS = nuc_boardinitialize.c
 
-ifeq ($(CONFIG_HAVE_CXX),y)
-CSRCS += nuc_cxxinitialize.c
-endif
-
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += nuc_led.c
 endif
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
index cd02024..f58f3e9 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
@@ -66,6 +66,5 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SPITOOL=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
index eea5fbe..ad4aa76 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
@@ -68,6 +68,5 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SPITOOL=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
index d3eb25c..ed8d2ab 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
@@ -81,6 +81,5 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SPITOOL=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
index 3eb467e..255561c 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
@@ -68,6 +68,5 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SPITOOL=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
index 8269069..055c9b8 100644
--- a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
@@ -50,5 +50,4 @@ CONFIG_START_YEAR=2019
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
index fd617f5..6c27cfd 100644
--- a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
@@ -50,5 +50,4 @@ CONFIG_START_YEAR=2019
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
index 5e79caa..e094a5a 100644
--- a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
@@ -50,5 +50,4 @@ CONFIG_START_YEAR=2019
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
index 641e317..cbbf3c6 100644
--- a/boards/arm/sam34/arduino-due/configs/nsh/defconfig
+++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
@@ -44,7 +44,6 @@ CONFIG_START_DAY=28
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
index 293fbed..4cbdbb1 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
@@ -45,7 +45,6 @@ CONFIG_START_DAY=28
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
index 0252e56..95fc967 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
@@ -60,7 +60,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=11
 CONFIG_START_MONTH=2
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
index 1c74b2c..2ce501d 100644
--- a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_START_DAY=9
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART0_SERIAL_CONSOLE=y
diff --git a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
index 63f7208..3d28959 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
@@ -92,7 +92,6 @@ CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_STDIO_BUFFER_SIZE=256
 CONFIG_SYSTEMTICK_EXTCLK=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=15
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
index b6a0af6..991cadd 100644
--- a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
@@ -46,7 +46,6 @@ CONFIG_START_DAY=12
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
index 1cea24f..b827a50 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
@@ -104,7 +104,6 @@ CONFIG_SIG_EVTHREAD=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSLOG_TIMESTAMP=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TTY_SIGINT=y
 CONFIG_TTY_SIGSTP=y
diff --git a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
index 940a3da..a0b8e27 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
@@ -72,7 +72,6 @@ CONFIG_SCHED_HPWORKPRIORITY=192
 CONFIG_SCHED_WAITPID=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UBOOT_UIMAGE=y
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
index 3f3165e..7ce5a5a 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
@@ -117,7 +117,6 @@ CONFIG_SYSTEM_CLE_CMD_HISTORY=y
 CONFIG_SYSTEM_CLE_CMD_HISTORY_LEN=20
 CONFIG_SYSTEM_CLE_CMD_HISTORY_LINELEN=120
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_SYSTEM_VI=y
 CONFIG_TTY_SIGINT=y
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
index 46ee8ec..2ba4535 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
@@ -58,6 +58,5 @@ CONFIG_START_MONTH=7
 CONFIG_START_YEAR=2014
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=2
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
index 6bc2337..c4f9f06 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
@@ -86,7 +86,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0"
 CONFIG_USART1_SERIAL_CONSOLE=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
index 0980749..2242e55 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
@@ -59,7 +59,6 @@ CONFIG_START_MONTH=7
 CONFIG_START_YEAR=2013
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=2
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
index 97e18fa..3c6b178 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
@@ -95,7 +95,6 @@ CONFIG_START_MONTH=7
 CONFIG_START_YEAR=2013
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
index 3e32c72..71eb1a8 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
@@ -151,7 +151,6 @@ CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_SYSTEM_PING6=y
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
index ca58ecb..1ef05cf 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
@@ -153,7 +153,6 @@ CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_SYSTEM_PING=y
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
index 8e90fd4..cc39eb9 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
@@ -94,7 +94,6 @@ CONFIG_START_MONTH=7
 CONFIG_START_YEAR=2014
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
index 3914999..e2e0793 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
@@ -58,7 +58,6 @@ CONFIG_START_DAY=21
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2015
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART3_RXBUFSIZE=64
diff --git a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
index b58be35..843f0e1 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
@@ -60,7 +60,6 @@ CONFIG_START_DAY=22
 CONFIG_START_MONTH=9
 CONFIG_START_YEAR=2019
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USBDEV=y
diff --git a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
index 316d37c..ac7011c 100644
--- a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
@@ -59,7 +59,6 @@ CONFIG_START_DAY=12
 CONFIG_START_MONTH=2
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART3_RXBUFSIZE=64
diff --git a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
index 6072f61..32e147a 100644
--- a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
@@ -59,7 +59,6 @@ CONFIG_START_DAY=21
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2015
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART3_RXBUFSIZE=64
diff --git a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
index a144c3d..ef0c159 100644
--- a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
@@ -62,7 +62,6 @@ CONFIG_START_DAY=12
 CONFIG_START_MONTH=2
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART3_RXBUFSIZE=64
diff --git a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
index ae8be79..8515f35 100644
--- a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=23
 CONFIG_START_MONTH=7
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART3_RXBUFSIZE=64
diff --git a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
index 2e1ee8c..5cd3272 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
@@ -44,7 +44,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=23
 CONFIG_START_MONTH=7
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
index 5649995..2869554 100644
--- a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
@@ -122,7 +122,6 @@ CONFIG_START_DAY=16
 CONFIG_START_MONTH=8
 CONFIG_SYSLOG_INTBUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING6=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_UART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
index e4d5f4a..43fc40f 100644
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@@ -130,7 +130,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_START_MONTH=7
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING6=y
 CONFIG_UART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/README.txt b/boards/arm/stm32/clicker2-stm32/README.txt
index b5d4e75..13c9f02 100644
--- a/boards/arm/stm32/clicker2-stm32/README.txt
+++ b/boards/arm/stm32/clicker2-stm32/README.txt
@@ -719,7 +719,6 @@ Configurations
 
       CONFIG_HAVE_CXX=y
       CONFIG_HAVE_CXXINITIALIZE=y
-      CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 
   usbnsh:
 
diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
index 9dfd07f..0ce7885 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
@@ -57,7 +57,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYS_RESERVED=8
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
index 5c7aff3..f5d1a3f 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
@@ -114,7 +114,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
index a3abcf9..cea73ec 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
@@ -62,7 +62,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
index 329acd0..fb23772 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
@@ -99,7 +99,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
index 524f10f..6d31cf6 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
@@ -116,7 +116,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
index 4038ed4..9a9b889 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
index 62ceda4..1579a87 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
@@ -67,7 +67,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSLOG_INTBUFFER=y
 CONFIG_SYSLOG_INTBUFSIZE=396
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
index 0b2198e..e400739 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
@@ -110,7 +110,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
index 0e286c6..54ac07e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
@@ -142,7 +142,6 @@ CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_TASK_NAME_SIZE=11
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
index 65a45ed..44782cd 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
@@ -73,7 +73,6 @@ CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
index ab44d45..d919d9e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
@@ -78,7 +78,6 @@ CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
index a7709af..8144f8b 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
@@ -80,7 +80,6 @@ CONFIG_STM32_PHYSR_ALTMODE=0x001c
 CONFIG_STM32_RMII_EXTCLK=y
 CONFIG_SYSTEM_DHCPC_RENEW=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
index b1d4f8d..50b8376 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_STM32_FMC=y
 CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
index 7c45362..7694b96 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TESTING_OSTEST=y
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
index f83526e..7cd6758 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
@@ -51,7 +51,6 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
index 9e55a50..a2a8e66 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
@@ -62,7 +62,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
index 3f1694e..dcef84b 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
index 4b946f5..8686a41 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
@@ -58,7 +58,6 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_TXBUFSIZE=128
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
index c2311ce..80bed69 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
@@ -61,7 +61,6 @@ CONFIG_STM32_USART2=y
 CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=1
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
index 5c24f07..5c4526e 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
@@ -79,7 +79,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_RMII_EXTCLK=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
index 6b17b8b..3da3953 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
@@ -50,7 +50,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
index 384c078..1034ee2 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
@@ -58,7 +58,6 @@ CONFIG_STM32_USART2=y
 CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=1
diff --git a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
index b131f1e..92b8cad 100644
--- a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
@@ -70,7 +70,6 @@ CONFIG_STM32_TIM1=y
 CONFIG_STM32_TIM1_ADC=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
index 6a4f743..ed4ec3e 100644
--- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
@@ -51,7 +51,6 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
index 3b118fb..95febc2 100644
--- a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
@@ -84,7 +84,6 @@ CONFIG_STM32_TIM1=y
 CONFIG_STM32_TIM1_ADC=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
index 01227cf..ab32cfb 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
@@ -64,7 +64,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_TIM1=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
index e9be67e..235d92f 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
@@ -58,7 +58,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_STM32_USBHOST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USBHOST_HIDKBD=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
index be48dad..27a1398 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
@@ -57,7 +57,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYS_RESERVED=8
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
index c748cc5..cb74a39 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
@@ -56,7 +56,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_USART3=y
 CONFIG_STM32_USBHOST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USBHOST_MSC=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
index 644e533..9ffcdae 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
@@ -64,7 +64,6 @@ CONFIG_STM32_USART3=y
 CONFIG_STM32_USART6=y
 CONFIG_STM32_USBHOST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_ZMODEM=y
 CONFIG_SYSTEM_ZMODEM_DEVNAME="/dev/ttyS1"
 CONFIG_SYSTEM_ZMODEM_IFLOW=y
diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
index a62b3b6..7cf1ba7 100644
--- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
+++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
@@ -124,7 +124,6 @@ CONFIG_STM32_USART1=y
 CONFIG_STM32_USART3=y
 CONFIG_STM32_USART6=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_ZMODEM=y
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
index 96067f9..32bec8e 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
@@ -76,7 +76,6 @@ CONFIG_STM32_RTC=y
 CONFIG_STM32_USART3=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_RXBUFSIZE=128
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
index f555109..50698ff 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
@@ -94,7 +94,6 @@ CONFIG_STM32_SDIO=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
index a8ed041..f1a99ac 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
@@ -83,7 +83,6 @@ CONFIG_STM32_USART3=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_RXBUFSIZE=128
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
index d967dd0..c7d83b5 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
@@ -96,7 +96,6 @@ CONFIG_STM32_SDIO=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
index 47db9c2..eb83558 100644
--- a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_STM32_USART2=y
 CONFIG_STM32_USB=y
 CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
index 454d05b..fb71a69 100644
--- a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
@@ -58,7 +58,6 @@ CONFIG_STM32_USB=y
 CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=1
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
index f1fb11a..fab2f0f 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
@@ -65,7 +65,6 @@ CONFIG_STM32_TIM1=y
 CONFIG_STM32_TIM1_ADC=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
index 7fff5ea..59b373a 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
@@ -68,7 +68,6 @@ CONFIG_STM32_SPI5=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
index f676ae1..52cfc4c 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
@@ -81,7 +81,6 @@ CONFIG_STMPE811_EDGE=y
 CONFIG_STMPE811_THRESHX=39
 CONFIG_STMPE811_THRESHY=51
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
index 1449384..bb42623 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
@@ -68,7 +68,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
index a49fcd6..3c27124 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
@@ -79,7 +79,6 @@ CONFIG_STMPE811_EDGE=y
 CONFIG_STMPE811_THRESHX=39
 CONFIG_STMPE811_THRESHY=51
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
index e4966c4..a43dc07 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
index 86e8cfe..e0cb0d1 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
@@ -77,7 +77,6 @@ CONFIG_STM32_LTDC_FB_SIZE=307200
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
index d2e76e5..e2e1dc7 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
@@ -59,7 +59,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_USART1=y
 CONFIG_STM32_USBHOST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USBHOST_MSC=y
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
index 55a05f7..f3230cd 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
@@ -64,7 +64,6 @@ CONFIG_STM32_OTGHS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USBDEV=y
diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt
index 312de18..328a1bd 100644
--- a/boards/arm/stm32/stm32f4discovery/README.txt
+++ b/boards/arm/stm32/stm32f4discovery/README.txt
@@ -1397,8 +1397,7 @@ Configuration Sub-directories
        CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
        CONFIG_UCLIBCXX_IOSTREAM_BUFSIZE=32
 
-       CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
-       CONFIG_EXAMPLES_ELF_UCLIBCXX=y
+       CONFIG_EXAMPLES_ELF_CXX=y
 
     6. By default, this configuration uses the ROMFS file system.  It can also
        be modified to use the compressed CROMFS:
diff --git a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
index e892d94..b8158f8 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
@@ -75,7 +75,6 @@ CONFIG_STM32_SPI_DMA=y
 CONFIG_STM32_USART2=y
 CONFIG_STM32_USBHOST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
index 2d05f82..6cd04ec 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
@@ -55,7 +55,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
index 2c27e8e..61f2748 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
@@ -78,7 +78,6 @@ CONFIG_STM32_USART3=y
 CONFIG_STM32_USART3_HCIUART=y
 CONFIG_STM32_USART6=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART6_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WIRELESS=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
index 5d7c12d..e3f337b 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
@@ -91,7 +91,6 @@ CONFIG_STM32_SDIO=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART6=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING6=y
 CONFIG_USART6_RXBUFSIZE=64
 CONFIG_USART6_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
index 3c88089..a852dec 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
@@ -55,7 +55,6 @@ CONFIG_STM32_SPI1=y
 CONFIG_STM32_SPI2=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
index ddd5112..bbb67f8 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
@@ -72,7 +72,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI2=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
index 924d826..ad3ce74 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
@@ -53,7 +53,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
index bba3a9f..450c2b2 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
@@ -96,7 +96,6 @@ CONFIG_STM32_SDIO=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART6=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_USART6_RXBUFSIZE=64
 CONFIG_USART6_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
index 98f3342..dd547de 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
index f09f58c..aa5c9e7 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
@@ -56,7 +56,6 @@ CONFIG_STM32_RTC=y
 CONFIG_STM32_TIM1=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
index 2ad4bb4..eb26319 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
@@ -54,7 +54,6 @@ CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART2=y
 CONFIG_STM32_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
index 49eb9c4..f5c7ef5 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
@@ -64,7 +64,6 @@ CONFIG_STM32_TIM3_CHANNEL=3
 CONFIG_STM32_TIM3_PWM=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
index 51a6c13..472767c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
@@ -95,7 +95,6 @@ CONFIG_STM32_SPI1=y
 CONFIG_STM32_USART2=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NSH_SYMTAB=y
 CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
 CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
index 076ac11..616e35c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
@@ -52,7 +52,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_USART2=y
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
index cd7693b..24f9084 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
@@ -56,7 +56,6 @@ CONFIG_STM32_USART2=y
 CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
 CONFIG_TASK_NAME_SIZE=0
diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
index 0c43878..9e7aaa8 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
@@ -57,7 +57,6 @@ CONFIG_STM32_USART2=y
 CONFIG_SYSLOG_CHAR=y
 CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=1
diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
index af6b2f4..2c1674f 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
@@ -96,7 +96,6 @@ CONFIG_STM32_SPI_DMA=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_DHCPC_RENEW=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NTPC=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_USART2_RXBUFSIZE=128
diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
index 0f1ea37..5557fb7 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
@@ -57,7 +57,6 @@ CONFIG_STM32_TIM1_CH1OUT=y
 CONFIG_STM32_TIM1_PWM=y
 CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART2_RXBUFSIZE=128
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=128
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt
index 1ccf07f..413902e 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt
@@ -324,6 +324,5 @@ Configurations
 
          CONFIG_HAVE_CXX=y
          CONFIG_HAVE_CXXINITIALIZE=y
-         CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 
        And also support for C++ constructors under apps/platform.
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt
index c3b3d79..df31b1c 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt
@@ -310,6 +310,5 @@ Configurations
 
          CONFIG_HAVE_CXX=y
          CONFIG_HAVE_CXXINITIALIZE=y
-         CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 
        And also support for C++ constructors under apps/platform.
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
index 2443454..5b8a58f 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
@@ -63,7 +63,6 @@ CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USERLED=y
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
index bdb7e08..e3ef3f9 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
@@ -63,7 +63,6 @@ CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USERLED=y
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
index bea1a31..b26ba35 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
@@ -62,7 +62,6 @@ CONFIG_STM32F7_LTDC_FB_BASE=0xc0000000
 CONFIG_STM32F7_LTDC_FB_SIZE=261120
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig
index b535c01..48f6606 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig
@@ -66,7 +66,6 @@ CONFIG_STM32F7_LTDC_FB_BASE=0xc0000000
 CONFIG_STM32F7_LTDC_FB_SIZE=261120
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_VIDEO_FB=y
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
index 7de3119..39520a1 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
@@ -81,7 +81,6 @@ CONFIG_STM32F7_PHYSR_ALTCONFIG=y
 CONFIG_STM32F7_PHYSR_ALTMODE=0x001c
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
index e268fd5..3483a78 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_STM32F7_USART6=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART6_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig
index aa90eb4..4b24bd4 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig
@@ -68,7 +68,6 @@ CONFIG_STM32F7_LTDC_FB_BASE=0xc0000000
 CONFIG_STM32F7_LTDC_FB_SIZE=261120
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_VIDEO_FB=y
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig
index 878227f..0f5b39f 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig
@@ -61,7 +61,6 @@ CONFIG_STM32F7_LTDC_FB_BASE=0xc0000000
 CONFIG_STM32F7_LTDC_FB_SIZE=261120
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_VIDEO_FB=y
diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
index eec067c..e3eca9b 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
@@ -88,7 +88,6 @@ CONFIG_STM32F7_USART1=y
 CONFIG_STM32F7_USART6=y
 CONFIG_SYSTEM_DHCPC_RENEW=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
index 6229b25..f6a65fb 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
@@ -48,7 +48,6 @@ CONFIG_SPI=y
 CONFIG_START_DAY=14
 CONFIG_STM32F7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
index 18708f4..b24d5fe 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
@@ -50,7 +50,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_STM32H7_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
index 0ca3650..a82ee68 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
@@ -68,7 +68,6 @@ CONFIG_START_YEAR=2011
 CONFIG_STM32H7_I2C2=y
 CONFIG_STM32H7_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
index f9dcef3..ae2f64a 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
@@ -68,7 +68,6 @@ CONFIG_STM32H7_TIM1_CHANNEL4=y
 CONFIG_STM32H7_TIM1_PWM=y
 CONFIG_STM32H7_USART3=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
index cc80d2d..70908ac 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
@@ -50,7 +50,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_STM32H7_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
index b5edabc..7d62e52 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
@@ -97,7 +97,6 @@ CONFIG_START_MONTH=8
 CONFIG_STM32L4_SPI3=y
 CONFIG_STM32L4_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
index 6c0929f..8359a34 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
@@ -88,7 +88,6 @@ CONFIG_START_MONTH=8
 CONFIG_STM32L4_SPI3=y
 CONFIG_STM32L4_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
index 3494174..9657ddb 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
@@ -99,7 +99,6 @@ CONFIG_START_MONTH=8
 CONFIG_STM32L4_SPI3=y
 CONFIG_STM32L4_USART1=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_TELNET_CLIENT=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
index 10f9fec..c7a3b66 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
@@ -62,7 +62,6 @@ CONFIG_STM32L4_SAI1PLL=y
 CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TESTING_OSTEST=y
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
index 84b5225..b903799 100644
--- a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
@@ -80,7 +80,6 @@ CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_STACKMONITOR=y
 CONFIG_SYSTEM_TEE=y
 CONFIG_TASK_NAME_SIZE=0
diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
index 293f3ba..18c5033 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
@@ -62,7 +62,6 @@ CONFIG_STM32L4_SAI1PLL=y
 CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TESTING_OSTEST=y
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
index 2ed6b05..b3b1a17 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
+++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
@@ -72,7 +72,6 @@ CONFIG_STM32L4_SPI1=y
 CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
index 8414de2..e1a3a55 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
@@ -95,7 +95,6 @@ CONFIG_STM32L4_USART2=y
 CONFIG_STM32L4_USART3=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_STACKMONITOR=y
 CONFIG_SYSTEM_TEE=y
 CONFIG_TASK_NAME_SIZE=0
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
index 71d1214..d8de397 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
@@ -74,7 +74,6 @@ CONFIG_STM32L4_RTC=y
 CONFIG_STM32L4_SAI1PLL=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYS_RESERVED=8
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
index 2fd5013..4674e74 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
@@ -75,7 +75,6 @@ CONFIG_STM32L4_RTC=y
 CONFIG_STM32L4_SAI1PLL=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
index e2ed848..4f94c01 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
@@ -78,7 +78,6 @@ CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_UART4=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYS_RESERVED=8
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART4_BAUD=2000000
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
index 27cf5e0..a0f6066 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
@@ -79,7 +79,6 @@ CONFIG_STM32L4_SRAM2_HEAP=y
 CONFIG_STM32L4_UART4=y
 CONFIG_STM32L4_USART2=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART4_BAUD=2000000
 CONFIG_UART4_RXBUFSIZE=512
diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig
index 9c0d580..b089980 100644
--- a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig
+++ b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_RV32IM_SYSTEM_CSRRS_SUPPORT=y
 CONFIG_START_DAY=27
 CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig
index 5548dde..b4727a8 100644
--- a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig
@@ -51,6 +51,5 @@ CONFIG_START_YEAR=2011
 CONFIG_SUPPRESS_CLOCK_CONFIG=y
 CONFIG_SUPPRESS_UART_CONFIG=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig b/boards/xtensa/esp32/esp32-core/configs/smp/defconfig
index b9a1a4a..2b70196 100644
--- a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig
+++ b/boards/xtensa/esp32/esp32-core/configs/smp/defconfig
@@ -60,7 +60,6 @@ CONFIG_START_YEAR=2011
 CONFIG_SUPPRESS_CLOCK_CONFIG=y
 CONFIG_SUPPRESS_UART_CONFIG=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_SYSTEM=y
 CONFIG_SYSTEM_TASKSET=y
 CONFIG_TESTING_OSTEST=y