Building of xyz_appinit.c should depend on CONFIG_LIB_BOARDCTL, not CONFIG_NSH_ARCHINITIALIZE

2026-10-06 22:05:21 +00:00 · 2016-02-04 12:14:17 -06:00 · 2016-02-04 12:14:17 -06:00 · 9ed7d56a18
commit 9ed7d56a18
parent 95d6131847
103 changed files with 118 additions and 122 deletions
--- 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

--- 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().
 *
 ****************************************************************************/
--- 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

--- 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

--- 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

--- 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

--- 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)
--- 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

--- 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

--- 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

--- 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

--- 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
 }
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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)
--- 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)
--- 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
--- 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

--- 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

--- 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().
 *
 ****************************************************************************/
--- 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

--- 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

--- 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
--- 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
--- 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

--- 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
--- 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

--- 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().
 *
 ****************************************************************************/
--- 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
 }
--- 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().
 *
 ****************************************************************************/
--- 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.
--- 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().
 *
 ****************************************************************************/
--- 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
 }
--- 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)
--- 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.
--- 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().
 *
 ****************************************************************************/
--- 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
 }
--- 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

--- 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

--- 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
 }
--- 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

--- 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

--- 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

--- 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 */

--- 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 */
--- 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

--- 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

--- 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
 }
--- 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

--- 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

--- 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)
--- 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

--- 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
 }
--- 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

--- 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
 }
--- 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)
--- 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

--- 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

--- 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
--- 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 */
--- 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

--- 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

--- 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
--- 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 */
--- 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

--- 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

--- 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

--- 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();
--- 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

--- 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();
--- 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

--- 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

--- 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

--- 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.
--- 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

--- 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

--- 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().
 *
 ****************************************************************************/
--- 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.
--- 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
 *
 ****************************************************************************/
--- 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
 *
 ****************************************************************************/
--- 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.
--- 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

--- 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

--- 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

--- 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
 }
--- 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

--- 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

--- 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

--- 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
--- a/Show more
+++ b/Show more