diff --git a/configs/arduino-due/src/Makefile b/configs/arduino-due/src/Makefile
index e5df7cfa768..e26901a09a1 100644
--- a/configs/arduino-due/src/Makefile
+++ b/configs/arduino-due/src/Makefile
@@ -61,7 +61,7 @@ CSRCS += sam_lcd.c
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/cc3200-launchpad/src/cc3200_boot.c b/configs/cc3200-launchpad/src/cc3200_boot.c
index 5cf1cfe05cf..9d466b2d75c 100644
--- a/configs/cc3200-launchpad/src/cc3200_boot.c
+++ b/configs/cc3200-launchpad/src/cc3200_boot.c
@@ -73,11 +73,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/cloudctrl/src/Makefile b/configs/cloudctrl/src/Makefile
index 820d9b0621f..f18f63eba3f 100644
--- a/configs/cloudctrl/src/Makefile
+++ b/configs/cloudctrl/src/Makefile
@@ -57,7 +57,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y)
 CSRCS += stm32_usb.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile
index a20efcd1447..78da4f12043 100644
--- a/configs/demo9s12ne64/src/Makefile
+++ b/configs/demo9s12ne64/src/Makefile
@@ -37,7 +37,7 @@
 
 ASRCS =
 CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += m9s12_appinit.c
 endif
 
diff --git a/configs/dk-tm4c129x/src/Makefile b/configs/dk-tm4c129x/src/Makefile
index 48420d6d1fe..28541cb38cc 100644
--- a/configs/dk-tm4c129x/src/Makefile
+++ b/configs/dk-tm4c129x/src/Makefile
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DK_TM4C129X_TIMER),y)
 CSRCS += tm4c_timer.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += tm4c_appinit.c
 endif
 
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index 8ffe55a2dde..3685f09453e 100644
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_LPC31_SPI),y)
 CSRCS += lpc31_spi.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc31_appinit.c
 endif
 
diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile
index 2b51a9331e8..2b5a68725a1 100644
--- a/configs/ea3152/src/Makefile
+++ b/configs/ea3152/src/Makefile
@@ -49,7 +49,7 @@ endif
 ifeq ($(CONFIG_LPC31_SPI),y)
 CSRCS += lpc31_spi.c
 endif
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc31_appinit.c
 endif
 ifeq ($(CONFIG_PAGING),y)
diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile
index d4a48022504..a62eba67b54 100644
--- a/configs/eagle100/src/Makefile
+++ b/configs/eagle100/src/Makefile
@@ -37,7 +37,7 @@
 
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lm_appinit.c
 endif
 
diff --git a/configs/ekk-lm3s9b96/src/Makefile b/configs/ekk-lm3s9b96/src/Makefile
index b39dbb14903..66505cb2c9b 100644
--- a/configs/ekk-lm3s9b96/src/Makefile
+++ b/configs/ekk-lm3s9b96/src/Makefile
@@ -38,7 +38,7 @@
 
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lm_appinit.c
 endif
 
diff --git a/configs/fire-stm32v2/src/Makefile b/configs/fire-stm32v2/src/Makefile
index 339d2da069a..c9c97c43e83 100644
--- a/configs/fire-stm32v2/src/Makefile
+++ b/configs/fire-stm32v2/src/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  stm32_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/freedom-kl25z/src/kl_boardinitialize.c b/configs/freedom-kl25z/src/kl_boardinitialize.c
index 3775bf2315d..a3036bd9075 100644
--- a/configs/freedom-kl25z/src/kl_boardinitialize.c
+++ b/configs/freedom-kl25z/src/kl_boardinitialize.c
@@ -124,7 +124,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 
diff --git a/configs/freedom-kl26z/src/kl_boardinitialize.c b/configs/freedom-kl26z/src/kl_boardinitialize.c
index 8cedfc4b25c..4d80f64591b 100644
--- a/configs/freedom-kl26z/src/kl_boardinitialize.c
+++ b/configs/freedom-kl26z/src/kl_boardinitialize.c
@@ -123,7 +123,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/hymini-stm32v/src/Makefile b/configs/hymini-stm32v/src/Makefile
index 5aef11195a8..f4a6dc26033 100644
--- a/configs/hymini-stm32v/src/Makefile
+++ b/configs/hymini-stm32v/src/Makefile
@@ -47,7 +47,7 @@ CSRCS += stm32_r61505u.c
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile
index 5c297a492a9..04a1da44509 100644
--- a/configs/kwikstik-k40/src/Makefile
+++ b/configs/kwikstik-k40/src/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k40_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += k40_appinit.c
 endif
 
diff --git a/configs/lincoln60/src/Makefile b/configs/lincoln60/src/Makefile
index 0c0eeb4fd00..07b3b39fde5 100644
--- a/configs/lincoln60/src/Makefile
+++ b/configs/lincoln60/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
 endif
 
diff --git a/configs/lm3s6432-s2e/src/Makefile b/configs/lm3s6432-s2e/src/Makefile
index 48bd97d6dd1..256778057a1 100644
--- a/configs/lm3s6432-s2e/src/Makefile
+++ b/configs/lm3s6432-s2e/src/Makefile
@@ -37,7 +37,7 @@
 
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lm_appinit.c
 endif
 
diff --git a/configs/lm3s6965-ek/src/lm_appinit.c b/configs/lm3s6965-ek/src/lm_appinit.c
index 5f570e01dc3..92b7099c58e 100644
--- a/configs/lm3s6965-ek/src/lm_appinit.c
+++ b/configs/lm3s6965-ek/src/lm_appinit.c
@@ -74,7 +74,7 @@
 
 /* PORT and SLOT number depend on the board configuration */
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 #  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S6965 Eval Kit MMC/SD is on SSI0"
 #    undef CONFIG_NSH_MMCSDSPIPORTNO
diff --git a/configs/lm3s8962-ek/src/lm_appinit.c b/configs/lm3s8962-ek/src/lm_appinit.c
index c66172af5a4..da171e263a6 100644
--- a/configs/lm3s8962-ek/src/lm_appinit.c
+++ b/configs/lm3s8962-ek/src/lm_appinit.c
@@ -61,7 +61,7 @@
 
 /* PORT and SLOT number depend on the board configuration */
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 #  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S8962 Eval Kit MMC/SD is on SSI0"
 #    undef CONFIG_NSH_MMCSDSPIPORTNO
diff --git a/configs/lm4f120-launchpad/src/Makefile b/configs/lm4f120-launchpad/src/Makefile
index 7beba52544f..c9ef636d6d9 100644
--- a/configs/lm4f120-launchpad/src/Makefile
+++ b/configs/lm4f120-launchpad/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += lm4f_autoleds.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lm4f_appinit.c
 endif
 
diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile
index 972b28127a0..71fb893f70a 100644
--- a/configs/lpc4330-xplorer/src/Makefile
+++ b/configs/lpc4330-xplorer/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc43_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc43_appinit.c
 endif
 
diff --git a/configs/lpc4337-ws/src/Makefile b/configs/lpc4337-ws/src/Makefile
index c2a57984a5d..d99f9903c62 100644
--- a/configs/lpc4337-ws/src/Makefile
+++ b/configs/lpc4337-ws/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc43_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc43_appinit.c
 endif
 
diff --git a/configs/lpc4357-evb/src/Makefile b/configs/lpc4357-evb/src/Makefile
index 0212fea639b..f9775f617eb 100644
--- a/configs/lpc4357-evb/src/Makefile
+++ b/configs/lpc4357-evb/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc43_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc43_appinit.c
 endif
 
diff --git a/configs/lpc4370-link2/src/Makefile b/configs/lpc4370-link2/src/Makefile
index 798b87e0644..24ef04f1733 100644
--- a/configs/lpc4370-link2/src/Makefile
+++ b/configs/lpc4370-link2/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc43_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc43_appinit.c
 endif
 
diff --git a/configs/lpcxpresso-lpc1115/src/Makefile b/configs/lpcxpresso-lpc1115/src/Makefile
index 2b04e2b8826..a55c8589293 100644
--- a/configs/lpcxpresso-lpc1115/src/Makefile
+++ b/configs/lpcxpresso-lpc1115/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc11_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc11_appinit.c
 endif
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
index 3e222645f20..ddbf899da44 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
@@ -55,7 +55,7 @@
 
 /* Configuration ************************************************************/
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 
 /* PORT and SLOT number probably depend on the board configuration */
 
@@ -107,7 +107,7 @@
 
 #else
 #  undef NSH_HAVEMMCSD
-#endif /* CONFIG_NSH_ARCHINIT */
+#endif /* CONFIG_LIB_BOARDCTL */
 
 /****************************************************************************
  * Private Data
diff --git a/configs/maple/src/Makefile b/configs/maple/src/Makefile
index 5c5269512da..7983d8f8841 100644
--- a/configs/maple/src/Makefile
+++ b/configs/maple/src/Makefile
@@ -43,7 +43,7 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y)
 CSRCS += stm32_lcd.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 endif
 
 ifeq ($(CONFIG_INPUT),y)
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index 453cd262ad4..1bd5a3e33cd 100644
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
 endif
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/mcu123-lpc214x/src/lpc2148_appinit.c b/configs/mcu123-lpc214x/src/lpc2148_appinit.c
index 3a6a94f282d..9bbddcd02a6 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_appinit.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_appinit.c
@@ -60,7 +60,7 @@
 
 /* PORT and SLOT number depend on the board configuration */
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 #  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
 #    error "The LPC214x MMC/SD is on SPI1"
 #    undef CONFIG_NSH_MMCSDSPIPORTNO
diff --git a/configs/mikroe-stm32f4/src/Makefile b/configs/mikroe-stm32f4/src/Makefile
index a181145e051..d19eda17f71 100644
--- a/configs/mikroe-stm32f4/src/Makefile
+++ b/configs/mikroe-stm32f4/src/Makefile
@@ -62,7 +62,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CSRCS += stm32_watchdog.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/mirtoo/src/Makefile b/configs/mirtoo/src/Makefile
index 076addb99a0..c49e08ecf0e 100644
--- a/configs/mirtoo/src/Makefile
+++ b/configs/mirtoo/src/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_PIC32MX_ADC),y)
 CSRCS += pic32_adc.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32_appinit.c
 endif
 
diff --git a/configs/moxa/src/moxart_appinit.c b/configs/moxa/src/moxart_appinit.c
index 32da3be6307..f33045ccf56 100644
--- a/configs/moxa/src/moxart_appinit.c
+++ b/configs/moxa/src/moxart_appinit.c
@@ -63,11 +63,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile
index 5520951fa5e..2fc6083a9d8 100644
--- a/configs/ne64badge/src/Makefile
+++ b/configs/ne64badge/src/Makefile
@@ -37,7 +37,7 @@
 
 ASRCS =
 CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += m9s12_appinit.c
 endif
 
diff --git a/configs/nucleo-f4x1re/src/stm32_boot.c b/configs/nucleo-f4x1re/src/stm32_boot.c
index 6e4cad3ed6b..580b2d08c46 100644
--- a/configs/nucleo-f4x1re/src/stm32_boot.c
+++ b/configs/nucleo-f4x1re/src/stm32_boot.c
@@ -120,7 +120,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   board_app_initialize();
 #endif
 
diff --git a/configs/nucleus2g/src/lpc17_appinit.c b/configs/nucleus2g/src/lpc17_appinit.c
index 7cb82f8ca26..af348d93c64 100644
--- a/configs/nucleus2g/src/lpc17_appinit.c
+++ b/configs/nucleus2g/src/lpc17_appinit.c
@@ -60,7 +60,7 @@
 
 /* PORT and SLOT number probably depend on the board configuration */
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 #  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Nucleus-2G MMC/SD is on SSP0"
 #    undef CONFIG_NSH_MMCSDSPIPORTNO
diff --git a/configs/nutiny-nuc120/src/Makefile b/configs/nutiny-nuc120/src/Makefile
index 423a07b0468..21840d8a371 100644
--- a/configs/nutiny-nuc120/src/Makefile
+++ b/configs/nutiny-nuc120/src/Makefile
@@ -62,8 +62,4 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CSRCS += nuc_watchdog.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += nuc_nsh.c
-endif
-
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/olimex-lpc-h3131/src/Makefile b/configs/olimex-lpc-h3131/src/Makefile
index 15ee6134c46..8c636018e84 100644
--- a/configs/olimex-lpc-h3131/src/Makefile
+++ b/configs/olimex-lpc-h3131/src/Makefile
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_LPC31_MCI),y)
 CSRCS += lpc31_mmcsd.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc31_appinit.c
 endif
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_appinit.c b/configs/olimex-lpc1766stk/src/lpc17_appinit.c
index b1794caaf49..cf2407508ae 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_appinit.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_appinit.c
@@ -66,7 +66,7 @@
 
 /* MMC/SD is on SSP port 1.  There is only a single slot, slot 0 */
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 #  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
 #    undef CONFIG_NSH_MMCSDSPIPORTNO
 #    define CONFIG_NSH_MMCSDSPIPORTNO 1
diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile
index c5c442a37ac..eb898252365 100644
--- a/configs/olimex-lpc2378/src/Makefile
+++ b/configs/olimex-lpc2378/src/Makefile
@@ -43,7 +43,7 @@
 ASRCS =
 CSRCS = lpc2378_leds.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc2378_appinit.c
 endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_appinit.c b/configs/olimex-stm32-h405/src/stm32_appinit.c
index feb4d13ebb0..623d9e34289 100644
--- a/configs/olimex-stm32-h405/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h405/src/stm32_appinit.c
@@ -75,11 +75,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/olimex-stm32-h405/src/stm32_boot.c b/configs/olimex-stm32-h405/src/stm32_boot.c
index 60b9c2f6244..f057314fb49 100644
--- a/configs/olimex-stm32-h405/src/stm32_boot.c
+++ b/configs/olimex-stm32-h405/src/stm32_boot.c
@@ -117,7 +117,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   board_app_initialize();
 #endif
 }
diff --git a/configs/olimex-stm32-h407/src/stm32_appinit.c b/configs/olimex-stm32-h407/src/stm32_appinit.c
index afff0c11ea1..e1d684735ab 100644
--- a/configs/olimex-stm32-h407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h407/src/stm32_appinit.c
@@ -108,11 +108,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/olimex-stm32-h407/src/stm32_boot.c b/configs/olimex-stm32-h407/src/stm32_boot.c
index cd4a5a54168..a9f793993e0 100644
--- a/configs/olimex-stm32-h407/src/stm32_boot.c
+++ b/configs/olimex-stm32-h407/src/stm32_boot.c
@@ -106,7 +106,7 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_INITIALIZE
 void board_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
diff --git a/configs/olimex-stm32-p207/src/stm32_appinit.c b/configs/olimex-stm32-p207/src/stm32_appinit.c
index cdc42a08735..01f6362c344 100644
--- a/configs/olimex-stm32-p207/src/stm32_appinit.c
+++ b/configs/olimex-stm32-p207/src/stm32_appinit.c
@@ -104,11 +104,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/olimex-stm32-p207/src/stm32_boot.c b/configs/olimex-stm32-p207/src/stm32_boot.c
index 60a47f0daf2..7234449534e 100644
--- a/configs/olimex-stm32-p207/src/stm32_boot.c
+++ b/configs/olimex-stm32-p207/src/stm32_boot.c
@@ -118,7 +118,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   board_app_initialize();
 #endif
 }
diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 2091c94ad97..b7114e32d55 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -37,7 +37,7 @@
 
 ASRCS =
 CSRCS = str71_spi.c str71_leds.c str71_buttons.c
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += str71_appinit.c
 endif
 ifeq ($(CONFIG_ENC28J60),y)
diff --git a/configs/olimexino-stm32/src/stm32_boot.c b/configs/olimexino-stm32/src/stm32_boot.c
index 8e36447b142..e7f0b807e8a 100644
--- a/configs/olimexino-stm32/src/stm32_boot.c
+++ b/configs/olimexino-stm32/src/stm32_boot.c
@@ -130,7 +130,7 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_INITIALIZE
 void board_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-
    * space but the initialization function must run in kernel space.
diff --git a/configs/open1788/src/lpc17_appinit.c b/configs/open1788/src/lpc17_appinit.c
index 47ff42c792b..53dd70aeb9d 100644
--- a/configs/open1788/src/lpc17_appinit.c
+++ b/configs/open1788/src/lpc17_appinit.c
@@ -364,11 +364,11 @@ static int nsh_usbhostinitialize(void)
  * Description:
  *   Perform architecture specific initialization for NSH.
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n:
+ *   CONFIG_LIB_BOARDCTL=n:
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/open1788/src/lpc17_boardinitialize.c b/configs/open1788/src/lpc17_boardinitialize.c
index 7e6302c60c8..201e6ff210e 100644
--- a/configs/open1788/src/lpc17_boardinitialize.c
+++ b/configs/open1788/src/lpc17_boardinitialize.c
@@ -135,7 +135,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/pcblogic-pic32mx/src/Makefile b/configs/pcblogic-pic32mx/src/Makefile
index ca2f8c53759..89a27422749 100644
--- a/configs/pcblogic-pic32mx/src/Makefile
+++ b/configs/pcblogic-pic32mx/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = pic32mx_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32mx_appinit.c
 endif
 
diff --git a/configs/pcduino-a10/src/Makefile b/configs/pcduino-a10/src/Makefile
index f9b07bc913e..347805555e5 100644
--- a/configs/pcduino-a10/src/Makefile
+++ b/configs/pcduino-a10/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = a1x_boot.c a1x_leds.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += a1x_nsh.c
 endif
 
diff --git a/configs/pcduino-a10/src/a1x_boot.c b/configs/pcduino-a10/src/a1x_boot.c
index 2f99f56af0b..951e8a87750 100644
--- a/configs/pcduino-a10/src/a1x_boot.c
+++ b/configs/pcduino-a10/src/a1x_boot.c
@@ -95,7 +95,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/pic32mx-starterkit/src/Makefile b/configs/pic32mx-starterkit/src/Makefile
index f58f7500c6e..52a42079ae7 100644
--- a/configs/pic32mx-starterkit/src/Makefile
+++ b/configs/pic32mx-starterkit/src/Makefile
@@ -45,7 +45,7 @@ CSRCS += pic32mx_usbterm.c
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32mx_appinit.c
 endif
 
diff --git a/configs/pic32mx7mmb/src/Makefile b/configs/pic32mx7mmb/src/Makefile
index 4523aebef08..79643f11c7d 100644
--- a/configs/pic32mx7mmb/src/Makefile
+++ b/configs/pic32mx7mmb/src/Makefile
@@ -45,7 +45,7 @@ CSRCS += pic32_usbterm.c
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32_appinit.c
 endif
 
diff --git a/configs/pic32mz-starterkit/src/Makefile b/configs/pic32mz-starterkit/src/Makefile
index d83d38d1485..b4c5b71af1f 100644
--- a/configs/pic32mz-starterkit/src/Makefile
+++ b/configs/pic32mz-starterkit/src/Makefile
@@ -48,7 +48,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += pic32mz_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32mz_appinit.c
 endif
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz-starterkit.h b/configs/pic32mz-starterkit/src/pic32mz-starterkit.h
index 10c4443e8c9..54846c0b247 100644
--- a/configs/pic32mz-starterkit/src/pic32mz-starterkit.h
+++ b/configs/pic32mz-starterkit/src/pic32mz-starterkit.h
@@ -76,7 +76,7 @@
 
 /* Make sure that the NSH configuration will support the SD card */
 
-#if defined(PIC32MZ_HAVE_MMCSD) && defined(CONFIG_NSH_ARCHINIT)
+#if defined(PIC32MZ_HAVE_MMCSD) && defined(CONFIG_LIB_BOARDCTL)
 
    /* Make sure that the NSH configuration uses the correct SPI */
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz_appinit.c b/configs/pic32mz-starterkit/src/pic32mz_appinit.c
index 3f9261310e4..a312b0e3272 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_appinit.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_appinit.c
@@ -43,7 +43,7 @@
 
 #include "pic32mz-starterkit.h"
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -70,4 +70,4 @@ int board_app_initialize(void)
 #endif
 }
 
-#endif /* CONFIG_NSH_ARCHINIT */
+#endif /* CONFIG_LIB_BOARDCTL */
diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile
index f28f2346634..74126afa912 100644
--- a/configs/sam3u-ek/src/Makefile
+++ b/configs/sam3u-ek/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_LCD),y)
 CSRCS += sam_lcd.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sam4e-ek/src/Makefile b/configs/sam4e-ek/src/Makefile
index 03882e37c86..680ddaab020 100644
--- a/configs/sam4e-ek/src/Makefile
+++ b/configs/sam4e-ek/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = sam_boot.c sam_leds.c sam_buttons.c sam_udp.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sam4e-ek/src/sam_boot.c b/configs/sam4e-ek/src/sam_boot.c
index 86e82558bad..d75f6bebc34 100644
--- a/configs/sam4e-ek/src/sam_boot.c
+++ b/configs/sam4e-ek/src/sam_boot.c
@@ -151,7 +151,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/sam4l-xplained/src/Makefile b/configs/sam4l-xplained/src/Makefile
index de2a6b63ca0..9a736c5d300 100644
--- a/configs/sam4l-xplained/src/Makefile
+++ b/configs/sam4l-xplained/src/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += sam_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sam4s-xplained-pro/src/Makefile b/configs/sam4s-xplained-pro/src/Makefile
index b34afd6d73c..62b5b372503 100644
--- a/configs/sam4s-xplained-pro/src/Makefile
+++ b/configs/sam4s-xplained-pro/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = sam_boot.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sama5d2-xult/src/Makefile b/configs/sama5d2-xult/src/Makefile
index 47065d68210..55e3d8b58e6 100644
--- a/configs/sama5d2-xult/src/Makefile
+++ b/configs/sama5d2-xult/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = sam_boot.c sam_userleds.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c sam_bringup.c
 else
 ifeq ($(CONFIG_BOARD_INITIALIZE),y)
diff --git a/configs/sama5d3-xplained/src/Makefile b/configs/sama5d3-xplained/src/Makefile
index 6d74b3320fe..09ae19353f5 100644
--- a/configs/sama5d3-xplained/src/Makefile
+++ b/configs/sama5d3-xplained/src/Makefile
@@ -84,7 +84,7 @@ CSRCS += sam_ethernet.c
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sama5d3-xplained/src/sam_boot.c b/configs/sama5d3-xplained/src/sam_boot.c
index 4ca22b7ee41..9a3c34c8256 100644
--- a/configs/sama5d3-xplained/src/sam_boot.c
+++ b/configs/sama5d3-xplained/src/sam_boot.c
@@ -152,7 +152,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/sama5d3x-ek/src/Makefile b/configs/sama5d3x-ek/src/Makefile
index e5b1a49df2b..86fd69cd020 100644
--- a/configs/sama5d3x-ek/src/Makefile
+++ b/configs/sama5d3x-ek/src/Makefile
@@ -106,7 +106,7 @@ endif
 endif
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/sama5d3x-ek/src/sam_boot.c b/configs/sama5d3x-ek/src/sam_boot.c
index 926de422297..ce065150c4c 100644
--- a/configs/sama5d3x-ek/src/sam_boot.c
+++ b/configs/sama5d3x-ek/src/sam_boot.c
@@ -152,7 +152,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/sama5d4-ek/src/Makefile b/configs/sama5d4-ek/src/Makefile
index 3b13ea848a4..6e13295ef2c 100644
--- a/configs/sama5d4-ek/src/Makefile
+++ b/configs/sama5d4-ek/src/Makefile
@@ -112,7 +112,7 @@ ifeq ($(CONFIG_INPUT_MXT),y)
 CSRCS += sam_maxtouch.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c sam_bringup.c
 else
 ifeq ($(CONFIG_BOARD_INITIALIZE),y)
diff --git a/configs/samd20-xplained/src/Makefile b/configs/samd20-xplained/src/Makefile
index af59a559954..ea245faaac3 100644
--- a/configs/samd20-xplained/src/Makefile
+++ b/configs/samd20-xplained/src/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += sam_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/samd21-xplained/src/Makefile b/configs/samd21-xplained/src/Makefile
index ce6b6480a98..4753e08244e 100644
--- a/configs/samd21-xplained/src/Makefile
+++ b/configs/samd21-xplained/src/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += sam_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/same70-xplained/src/Makefile b/configs/same70-xplained/src/Makefile
index ad1d3d4885e..4d883fccb75 100644
--- a/configs/same70-xplained/src/Makefile
+++ b/configs/same70-xplained/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_SAMV7_SDRAMC),y)
 CSRCS += sam_sdram.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c sam_bringup.c
 else ifeq ($(CONFIG_BOARD_INITIALIZE),y)
 CSRCS += sam_bringup.c
diff --git a/configs/same70-xplained/src/sam_appinit.c b/configs/same70-xplained/src/sam_appinit.c
index 2026dd4836e..8c50a8761ba 100644
--- a/configs/same70-xplained/src/sam_appinit.c
+++ b/configs/same70-xplained/src/sam_appinit.c
@@ -43,7 +43,7 @@
 
 #include "same70-xplained.h"
 
-#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BUILD_KERNEL)
+#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BUILD_KERNEL)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,4 +72,4 @@ int board_app_initialize(void)
 #endif
 }
 
-#endif /* CONFIG_NSH_ARCHINIT && !CONFIG_BUILD_KERNEL */
+#endif /* CONFIG_LIB_BOARDCTL && !CONFIG_BUILD_KERNEL */
diff --git a/configs/same70-xplained/src/same70-xplained.h b/configs/same70-xplained/src/same70-xplained.h
index f377d2ba2f3..8a21b522844 100644
--- a/configs/same70-xplained/src/same70-xplained.h
+++ b/configs/same70-xplained/src/same70-xplained.h
@@ -345,7 +345,7 @@ void sam_sdram_config(void);
  *
  ************************************************************************************/
 
-#if defined(CONFIG_NSH_ARCHINIT) || defined(CONFIG_BOARD_INITIALIZE)
+#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE)
 int sam_bringup(void);
 #endif
 
diff --git a/configs/saml21-xplained/src/Makefile b/configs/saml21-xplained/src/Makefile
index e27139e5792..c35bb2e9f66 100644
--- a/configs/saml21-xplained/src/Makefile
+++ b/configs/saml21-xplained/src/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += sam_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c
 endif
 
diff --git a/configs/samv71-xult/src/Makefile b/configs/samv71-xult/src/Makefile
index 2520789fcb2..46dd2e6a4fd 100644
--- a/configs/samv71-xult/src/Makefile
+++ b/configs/samv71-xult/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_SAMV7_SDRAMC),y)
 CSRCS += sam_sdram.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += sam_appinit.c sam_bringup.c
 else ifeq ($(CONFIG_BOARD_INITIALIZE),y)
 CSRCS += sam_bringup.c
diff --git a/configs/samv71-xult/src/sam_appinit.c b/configs/samv71-xult/src/sam_appinit.c
index 59b977ca5f7..9f81a5e407b 100644
--- a/configs/samv71-xult/src/sam_appinit.c
+++ b/configs/samv71-xult/src/sam_appinit.c
@@ -43,7 +43,7 @@
 
 #include "samv71-xult.h"
 
-#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BUILD_KERNEL)
+#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BUILD_KERNEL)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,4 +72,4 @@ int board_app_initialize(void)
 #endif
 }
 
-#endif /* CONFIG_NSH_ARCHINIT && !CONFIG_BUILD_KERNEL */
+#endif /* CONFIG_LIB_BOARDCTL && !CONFIG_BUILD_KERNEL */
diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h
index 238fd0f7c79..ed9e37d8ef0 100644
--- a/configs/samv71-xult/src/samv71-xult.h
+++ b/configs/samv71-xult/src/samv71-xult.h
@@ -565,7 +565,7 @@ void sam_sdram_config(void);
  *
  ************************************************************************************/
 
-#if defined(CONFIG_NSH_ARCHINIT) || defined(CONFIG_BOARD_INITIALIZE)
+#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE)
 int sam_bringup(void);
 #endif
 
diff --git a/configs/shenzhou/src/Makefile b/configs/shenzhou/src/Makefile
index 6168fe3975e..15458ca938d 100644
--- a/configs/shenzhou/src/Makefile
+++ b/configs/shenzhou/src/Makefile
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y)
 CSRCS += stm32_usb.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/spark/src/Makefile b/configs/spark/src/Makefile
index 052bde93973..7c4bcfb4aae 100644
--- a/configs/spark/src/Makefile
+++ b/configs/spark/src/Makefile
@@ -49,7 +49,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  stm32_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index 951fc55567f..339cf3f0aca 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -287,7 +287,7 @@ int board_app_initialize(void)
 
 int usbmsc_archinitialize(void)
 {
-#if defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_LIB_BOARDCTL)
   return OK;
 #else
   return board_app_initialize();
diff --git a/configs/spark/src/stm32_boot.c b/configs/spark/src/stm32_boot.c
index 092a0b2a4a1..763538bebdf 100644
--- a/configs/spark/src/stm32_boot.c
+++ b/configs/spark/src/stm32_boot.c
@@ -122,7 +122,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   board_app_initialize();
 #endif
 
diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c
index b555a46fa63..c4a3f8fdb37 100644
--- a/configs/spark/src/stm32_composite.c
+++ b/configs/spark/src/stm32_composite.c
@@ -127,7 +127,7 @@
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NSH_ARCHINIT) || !defined(CONFIG_NSH_BUILTIN_APPS)
+#if !defined(CONFIG_LIB_BOARDCTL) || !defined(CONFIG_NSH_BUILTIN_APPS)
 static int do_composite_archinitialize(void)
 {
 #ifdef HAVE_SST25
@@ -293,7 +293,7 @@ static int do_composite_archinitialize(void)
 
 int composite_archinitialize(void)
 {
-#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_NSH_BUILTIN_APPS)
+#if defined(CONFIG_LIB_BOARDCTL) && defined(CONFIG_NSH_BUILTIN_APPS)
   return OK;
 #else
   return do_composite_archinitialize();
diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index 3e6d599ea6a..301f0eed9d0 100644
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -44,7 +44,7 @@ CSRCS += stm32_deselectnor.c stm32_selectsram.c stm32_deselectsram.c
 CSRCS += stm32_selectlcd.c stm32_deselectlcd.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/stm3220g-eval/src/Makefile b/configs/stm3220g-eval/src/Makefile
index b68d6cbef32..fe48b22317f 100644
--- a/configs/stm3220g-eval/src/Makefile
+++ b/configs/stm3220g-eval/src/Makefile
@@ -68,7 +68,7 @@ ifeq ($(CONFIG_CAN),y)
 CSRCS += stm32_can.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/stm3240g-eval/src/Makefile b/configs/stm3240g-eval/src/Makefile
index 7f220e50681..8035987fb36 100644
--- a/configs/stm3240g-eval/src/Makefile
+++ b/configs/stm3240g-eval/src/Makefile
@@ -69,7 +69,7 @@ ifeq ($(CONFIG_CAN),y)
 CSRCS += stm32_can.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/stm3240g-eval/src/stm32_boot.c b/configs/stm3240g-eval/src/stm32_boot.c
index 6a9856048a0..47322b69cd5 100644
--- a/configs/stm3240g-eval/src/stm32_boot.c
+++ b/configs/stm3240g-eval/src/stm32_boot.c
@@ -106,7 +106,7 @@
 #undef HAVE_INITTHREAD
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#  if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
 #    define HAVE_INITTHREAD 1
 #  elif defined(HAVE_NXSTART)
 #    define HAVE_INITTHREAD 1
@@ -155,7 +155,7 @@ static int board_initthread(int argc, char *argv[])
 {
   int ret;
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
diff --git a/configs/stm32_tiny/src/Makefile b/configs/stm32_tiny/src/Makefile
index 5b29a4aa089..a29dd097b2d 100644
--- a/configs/stm32_tiny/src/Makefile
+++ b/configs/stm32_tiny/src/Makefile
@@ -47,7 +47,7 @@ ifeq ($(CONFIG_WL_NRF24L01),y)
 CSRCS += stm32_wireless.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/stm32f3discovery/src/Makefile b/configs/stm32f3discovery/src/Makefile
index ffcb57a981e..cac567aa4cd 100644
--- a/configs/stm32f3discovery/src/Makefile
+++ b/configs/stm32f3discovery/src/Makefile
@@ -64,7 +64,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CSRCS += stm32_watchdog.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index 8f42fbab182..719ebc031ab 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -123,11 +123,11 @@
  * Description:
  *   Perform architecture specific initialization
  *
- *   CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
+ *   CONFIG_LIB_BOARDCTL=n :
  *     Called from board_initialize().
  *
  ****************************************************************************/
diff --git a/configs/stm32f429i-disco/src/stm32_boot.c b/configs/stm32f429i-disco/src/stm32_boot.c
index 5f389b06f42..2cf12677bcd 100644
--- a/configs/stm32f429i-disco/src/stm32_boot.c
+++ b/configs/stm32f429i-disco/src/stm32_boot.c
@@ -143,7 +143,7 @@ void board_initialize(void)
   board_lcd_initialize();
 #endif
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index 6670b81ab97..5426801019a 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -86,7 +86,7 @@
  *   CONFIG_BOARD_INITIALIZE=y :
  *     Called from board_initialize().
  *
- *   CONFIG_BOARD_INITIALIZE=n && CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  ****************************************************************************/
diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h
index 6caa848e927..563a0304d15 100644
--- a/configs/stm32f4discovery/src/stm32f4discovery.h
+++ b/configs/stm32f4discovery/src/stm32f4discovery.h
@@ -130,7 +130,7 @@
   /* SD card bringup does not work if performed on the IDLE thread because it
    * will cause waiting.  Use either:
    *
-   *  CONFIG_NSH_ARCHINIT=y, OR
+   *  CONFIG_LIB_BOARDCTL=y, OR
    *  CONFIG_BOARD_INITIALIZE=y && CONFIG_BOARD_INITTHREAD=y
    */
 
@@ -375,7 +375,7 @@ int stm32_bmp180initialize(FAR const char *devpath);
  *   CONFIG_BOARD_INITIALIZE=y :
  *     Called from board_initialize().
  *
- *   CONFIG_BOARD_INITIALIZE=y && CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  ****************************************************************************/
@@ -504,7 +504,7 @@ void stm32_pm_buttons(void);
  *   CONFIG_BOARD_INITIALIZE=y :
  *     Called from board_initialize().
  *
- *   CONFIG_BOARD_INITIALIZE=n && CONFIG_NSH_ARCHINIT=y :
+ *   CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
  *     Called from the NSH library
  *
  ****************************************************************************/
diff --git a/configs/stm32f746g-disco/src/stm32_boot.c b/configs/stm32f746g-disco/src/stm32_boot.c
index d474f3c8a32..381925dee1f 100644
--- a/configs/stm32f746g-disco/src/stm32_boot.c
+++ b/configs/stm32f746g-disco/src/stm32_boot.c
@@ -115,7 +115,7 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_INITIALIZE
 void board_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
diff --git a/configs/stm32ldiscovery/src/Makefile b/configs/stm32ldiscovery/src/Makefile
index e9120815c0a..7e17afc3d6b 100644
--- a/configs/stm32ldiscovery/src/Makefile
+++ b/configs/stm32ldiscovery/src/Makefile
@@ -64,7 +64,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CSRCS += stm32_watchdog.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/sure-pic32mx/src/Makefile b/configs/sure-pic32mx/src/Makefile
index 30bb00d0a0c..8b3061a4177 100644
--- a/configs/sure-pic32mx/src/Makefile
+++ b/configs/sure-pic32mx/src/Makefile
@@ -62,7 +62,7 @@ ifeq ($(CONFIG_LCD_LCD1602),y)
 CSRCS += pic32mx_lcd1602.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32mx_appinit.c
 endif
 
diff --git a/configs/teensy-3.x/src/Makefile b/configs/teensy-3.x/src/Makefile
index e58254757a6..ad839632dda 100644
--- a/configs/teensy-3.x/src/Makefile
+++ b/configs/teensy-3.x/src/Makefile
@@ -44,7 +44,7 @@ else
 CSRCS += k20_userleds.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += k20_appinit.c
 endif
 
diff --git a/configs/teensy-lc/src/kl_boardinitialize.c b/configs/teensy-lc/src/kl_boardinitialize.c
index 0f3da306449..c99ef366731 100644
--- a/configs/teensy-lc/src/kl_boardinitialize.c
+++ b/configs/teensy-lc/src/kl_boardinitialize.c
@@ -135,7 +135,7 @@ void board_initialize(void)
    * but the initialization function must run in kernel space.
    */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
   (void)board_app_initialize();
 #endif
 }
diff --git a/configs/tm4c123g-launchpad/src/Makefile b/configs/tm4c123g-launchpad/src/Makefile
index 663467d25a3..90986647772 100644
--- a/configs/tm4c123g-launchpad/src/Makefile
+++ b/configs/tm4c123g-launchpad/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += tm4c_autoleds.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += tm4c_appinit.c
 endif
 
diff --git a/configs/tm4c1294-launchpad/src/Makefile b/configs/tm4c1294-launchpad/src/Makefile
index 73d28f01b77..35532e4824c 100644
--- a/configs/tm4c1294-launchpad/src/Makefile
+++ b/configs/tm4c1294-launchpad/src/Makefile
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DK_TM4C129X_TIMER),y)
 CSRCS += tm4c_timer.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += tm4c_appinit.c
 endif
 
diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile
index a01825d472a..07e278d63b5 100644
--- a/configs/twr-k60n512/src/Makefile
+++ b/configs/twr-k60n512/src/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k60_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += k60_appinit.c
 endif
 
diff --git a/configs/u-blox-c027/src/lpc17_appinit.c b/configs/u-blox-c027/src/lpc17_appinit.c
index 1b534e8c9c3..44e95651825 100644
--- a/configs/u-blox-c027/src/lpc17_appinit.c
+++ b/configs/u-blox-c027/src/lpc17_appinit.c
@@ -57,7 +57,7 @@
 
 /* Configuration ************************************************************/
 
-#ifdef CONFIG_NSH_ARCHINIT
+#ifdef CONFIG_LIB_BOARDCTL
 
 /* PORT and SLOT number probably depend on the board configuration */
 
@@ -109,7 +109,7 @@
 
 #else
 #  undef NSH_HAVEMMCSD
-#endif /* CONFIG_NSH_ARCHINIT */
+#endif /* CONFIG_LIB_BOARDCTL */
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/ubw32/src/Makefile b/configs/ubw32/src/Makefile
index e0e0cc29e20..e3703b64891 100644
--- a/configs/ubw32/src/Makefile
+++ b/configs/ubw32/src/Makefile
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += pic32_buttons.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += pic32_appinit.c
 endif
 
diff --git a/configs/viewtool-stm32f107/src/Makefile b/configs/viewtool-stm32f107/src/Makefile
index 7897b9ea2f7..0ce9b9bb079 100644
--- a/configs/viewtool-stm32f107/src/Makefile
+++ b/configs/viewtool-stm32f107/src/Makefile
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_LCD_SSD1289),y) # F103
 CSRCS += stm32_ssd1289.c
 endif
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
diff --git a/configs/zkit-arm-1769/src/Makefile b/configs/zkit-arm-1769/src/Makefile
index f6f3d7354d5..80905b88538 100644
--- a/configs/zkit-arm-1769/src/Makefile
+++ b/configs/zkit-arm-1769/src/Makefile
@@ -43,7 +43,7 @@
 ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_buttons.c lpc17_lcd.c
 
-ifeq ($(CONFIG_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
 endif