Rename arch_nshinitialize() to board_app_initialize()

configs/Kconfig

@@ -1581,3 +1581,7 @@ endif
 if ARCH_BOARD_SIM
 source "configs/sim/Kconfig"
 endif
+
+config LIB_BOARDCTL
+	bool "Enabled boardctl() interface"
+	default n

configs/arduino-due/src/sam_nsh.c

@@ -42,6 +42,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #include "arduino-due.h"
 
 /****************************************************************************
@@ -71,14 +73,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
     defined(CONFIG_MMCSD_SPI)
@@ -89,7 +91,7 @@ int nsh_archinitialize(void)
     if (ret < 0)
       {
         syslog(LOG_ERR,
-               "nsh_archinitialize: Failed to initialize MMC/SD slot: %d\n",
+               "board_app_initialize: Failed to initialize MMC/SD slot: %d\n",
                ret);
        return ret;
       }

configs/cc3200-launchpad/src/cc3200_boot.c

@@ -45,6 +45,7 @@
 #include <debug.h>
 #include <stdio.h>
 
+#include <nuttx/board.h>
 #include <arch/board/board.h>
 #include <arch/board/cc3200_utils.h>
 #include <apps/nsh.h>
@@ -67,7 +68,7 @@
  * Public Functions
  ****************************************************************************/
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -81,7 +82,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/cloudctrl/src/stm32_nsh.c

@@ -45,6 +45,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 #include "cloudctrl-internal.h"
 
@@ -101,14 +103,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_USBHOST) || defined(HAVE_W25)
   int ret;

configs/cloudctrl/src/stm32_usbmsc.c

@@ -72,8 +72,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initized in board_app_initialize() (see stm32_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/demo9s12ne64/src/m9s12_nsh.c

@@ -43,6 +43,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "demo9s12ne64.h"
 
 /****************************************************************************
@@ -54,14 +56,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* Configure SPI-based devices */
 

configs/dk-tm4c129x/src/tm4c_nsh.c

@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/board.h>
+
 #include "dk-tm4c129x.h"
 
 /****************************************************************************
@@ -50,14 +52,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was
    * already performed in board_initialize.

configs/ea3131/src/lpc31_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_LPC31_MCI
 #  include <nuttx/sdio.h>
 #  include <nuttx/mmcsd.h>
@@ -100,14 +102,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   FAR struct sdio_dev_s *sdio;

configs/ea3152/src/lpc31_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_LPC31_MCI
 #  include <nuttx/sdio.h>
 #  include <nuttx/mmcsd.h>
@@ -100,14 +102,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   FAR struct sdio_dev_s *sdio;

configs/eagle100/src/lm_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -95,14 +96,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;

configs/ekk-lm3s9b96/src/lm_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -53,14 +55,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/fire-stm32v2/src/stm32_composite.c

@@ -70,8 +70,8 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
+   * In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
    * was built.

configs/fire-stm32v2/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 #include "fire-internal.h"
 
@@ -127,14 +129,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_MMCSD) || defined(HAVE_W25)
   int ret;

configs/fire-stm32v2/src/stm32_usbmsc.c

@@ -71,8 +71,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/freedom-kl25z/src/kl_boardinitialize.c

@@ -125,7 +125,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 
   /* CC3000 wireless initialization */

configs/freedom-kl25z/src/kl_nsh.c

@@ -43,6 +43,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_NSH_LIBRARY
 
 /****************************************************************************
@@ -54,7 +56,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -68,7 +70,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(CONFIG_SENSORS_ADXL345)
   int ret;

configs/freedom-kl26z/src/kl_boardinitialize.c

@@ -124,7 +124,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif

configs/freedom-kl26z/src/kl_nsh.c

@@ -43,6 +43,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_NSH_LIBRARY
 
 /****************************************************************************
@@ -54,7 +56,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -68,7 +70,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/hymini-stm32v/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd/mtd.h>
@@ -144,14 +146,14 @@ static int nsh_cdinterrupt(int irq, FAR void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   int ret;

configs/hymini-stm32v/src/stm32_usbmsc.c

@@ -89,8 +89,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/kwikstik-k40/src/k40_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_KINETIS_SDHC
 #  include <nuttx/sdio.h>
 #  include <nuttx/mmcsd.h>
@@ -178,14 +180,14 @@ static int kinetis_cdinterrupt(int irq, FAR void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   int ret;

configs/kwikstik-k40/src/k40_usbmsc.c

@@ -85,8 +85,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see k40_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/lincoln60/src/lpc17_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -55,14 +56,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/lm3s6432-s2e/src/lm_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -55,14 +56,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/lm3s6965-ek/src/lm_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -95,14 +96,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;

configs/lm3s8962-ek/src/lm_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -95,14 +96,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;

configs/lm4f120-launchpad/src/lm4f_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -73,14 +74,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/lpc4330-xplorer/src/lpc43_nsh.c

@@ -43,6 +43,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "chip.h"
 
 #ifdef CONFIG_LPC43_SPIFI
@@ -132,14 +134,14 @@ static int nsh_spifi_initialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* Initialize the SPIFI block device */
 

configs/lpc4357-evb/src/lpc43_nsh.c

@@ -43,6 +43,8 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "chip.h"
 
 #ifdef CONFIG_LPC43_SPIFI
@@ -132,14 +134,14 @@ static int nsh_spifi_initialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* Initialize the SPIFI block device */
 

configs/lpcxpresso-lpc1768/src/lpc17_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -111,14 +112,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   FAR struct spi_dev_s *ssp;

configs/mbed/src/lpc17_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -72,14 +73,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/mcu123-lpc214x/src/lpc2148_composite.c

@@ -86,8 +86,8 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see lpc2148_nsh.c).
+   * In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
    * was built.

configs/mcu123-lpc214x/src/lpc2148_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -95,14 +96,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;

configs/mikroe-stm32f4/src/stm32_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 
 #ifdef CONFIG_STM32_SPI3
@@ -155,14 +156,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef CONFIG_STM32_SPI3
   FAR struct spi_dev_s *spi;

configs/mirtoo/src/pic32_nsh.c

@@ -46,6 +46,8 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_PIC32MX_SPI2
 #  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd/mtd.h>
@@ -89,14 +91,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef HAVE_SST25
   FAR struct spi_dev_s *spi;

configs/ne64badge/src/m9s12_nsh.c

@@ -43,6 +43,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "ne64badge_internal.h"
 
 /****************************************************************************
@@ -54,14 +56,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* Configure SPI-based devices */
 

configs/nucleo-f4x1re/src/stm32_boot.c

@@ -121,7 +121,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  nsh_archinitialize();
+  board_app_initialize();
 #endif
 
   /* CC3000 wireless initialization */

configs/nucleo-f4x1re/src/stm32_nsh.c

@@ -44,6 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -85,14 +86,14 @@ void up_netinitialize(void)
 #endif
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_MMCSD) || defined(CONFIG_AJOYSTICK)
   int ret;

configs/nucleus2g/src/lpc17_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -105,14 +106,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   FAR struct spi_dev_s *ssp;
   int ret;

configs/olimex-lpc-h3131/src/lpc31_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -74,14 +76,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_MMCSD) || defined(HAVE_USBHOST)
   int ret;

configs/olimex-lpc1766stk/src/lpc17_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
@@ -280,14 +281,14 @@ static int nsh_usbhostinitialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret;
 

configs/olimex-lpc2378/src/lpc2378_nsh.c

@@ -49,6 +49,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -84,14 +85,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   return OK;
 }

configs/olimex-stm32-h405/src/olimex-stm32-h405.h

@@ -88,25 +88,6 @@
 void weak_function stm32_usbinitialize(void);
 #endif
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 /************************************************************************************
  * Name: stm32_adc_initialize
  *

configs/olimex-stm32-h405/src/stm32_boot.c

@@ -118,7 +118,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  nsh_archinitialize();
+  board_app_initialize();
 #endif
 }
 #endif

configs/olimex-stm32-h405/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -68,7 +70,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -82,7 +84,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(CONFIG_CAN) || defined(CONFIG_ADC)
   int ret;

configs/olimex-stm32-p207/src/olimex-stm32-p207.h

@@ -124,25 +124,6 @@ void weak_function stm32_usbinitialize(void);
 int stm32_usbhost_initialize(void);
 #endif
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 /************************************************************************************
  * Name: stm32_adc_initialize
  *

configs/olimex-stm32-p207/src/stm32_boot.c

@@ -119,7 +119,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  nsh_archinitialize();
+  board_app_initialize();
 #endif
 }
 #endif

configs/olimex-stm32-p207/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -97,7 +99,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -111,7 +113,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(CONFIG_ADC)
   int ret;

configs/olimex-strp711/src/str71_nsh.c

@@ -43,6 +43,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
@@ -99,14 +100,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVEMMCSD
   FAR struct spi_dev_s *spi;

configs/olimexino-stm32/src/olimexino-stm32.h

@@ -171,25 +171,6 @@ void stm32_usbinitialize(void);
 
 void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler);
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 /****************************************************************************
  * Name: stm32_led_initialize
  *

configs/olimexino-stm32/src/stm32_boot.c

@@ -136,7 +136,7 @@ void board_initialize(void)
    * space but the initialization function must run in kernel space.
    */
 
-  nsh_archinitialize();
+  board_app_initialize();
 #endif
 
 #if defined(CONFIG_USBDEV)

configs/olimexino-stm32/src/stm32_composite.c

@@ -91,7 +91,7 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see stm32_nsh.c).
+   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
    * In this case, there is nothing further to be done here.
    */
 

configs/olimexino-stm32/src/stm32_nsh.c

@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mmcsd.h>
 
@@ -75,14 +76,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret = OK;
 

configs/olimexino-stm32/src/stm32_usbmsc.c

@@ -93,7 +93,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see stm32_nsh.c).
+   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
    * In this case, there is nothing further to be done here.
    */
 

configs/open1788/src/lpc17_boardinitialize.c

@@ -136,7 +136,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif

configs/open1788/src/lpc17_nsh.c

@@ -46,6 +46,7 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
@@ -343,7 +344,7 @@ static int nsh_usbhostinitialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization for NSH.
@@ -357,7 +358,7 @@ static int nsh_usbhostinitialize(void)
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret;
 

configs/open1788/src/open1788.h

@@ -225,24 +225,5 @@ void open1788_nand_initialize(void);
 void open1788_lcd_initialize(void);
 #endif
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n:
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_OPEN1788_SRC_OPEN1788_H */

configs/pcblogic-pic32mx/src/pic32mx_nsh.c

@@ -41,6 +41,7 @@
 
 #include <syslog.h>
 
+#include <nuttx/board.h>
 #include <nuttx/lcd/hd4478ou.h>
 #include <arch/board/board.h>
 
@@ -61,14 +62,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret = OK;
 

configs/pcduino-a10/src/a1x_boot.c

@@ -96,7 +96,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif /* CONFIG_BOARD_INITIALIZE */

configs/pcduino-a10/src/pcduino_a10.h

@@ -155,24 +155,5 @@
 
 void a1x_led_initialize(void);
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_PCDUINO_A10_PCDUINO_A10_H */
-

configs/pic32mx-starterkit/src/pic32mx_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
@@ -330,14 +331,14 @@ static int nsh_usbdevinitialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret;
 

configs/pic32mx-starterkit/src/pic32mx_usbmsc.c

@@ -61,8 +61,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see
+   * pic32mx_nsh.c).  In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/pic32mx-starterkit/src/pic32mx_usbterm.c

@@ -76,7 +76,7 @@ int usbterm_devinit(void)
    * we will fake it and tell the USB driver that the USB is connected now.
    *
    * If examples/usbterm is built as an NSH built-in application, then
-   * pic32mx_usbattach() will be called in nsh_archinitialize().
+   * pic32mx_usbattach() will be called in board_app_initialize().
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/pic32mx7mmb/src/pic32_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
@@ -340,14 +341,14 @@ static int nsh_usbdevinitialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   int ret;
 

configs/pic32mx7mmb/src/pic32_usbmsc.c

@@ -61,8 +61,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see pic32_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/pic32mx7mmb/src/pic32_usbterm.c

@@ -77,7 +77,7 @@ int usbterm_devinit(void)
    * connected now.
    *
    * If examples/usbterm is built as an NSH built-in application, then
-   * pic32mx_usbattach() will be called in nsh_archinitialize().
+   * pic32mx_usbattach() will be called in board_app_initialize().
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/pic32mz-starterkit/src/pic32mz_nsh.c

@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/board.h>
+
 #include "pic32mz-starterkit.h"
 
 #ifdef CONFIG_NSH_ARCHINIT
@@ -48,14 +50,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
   /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was
    * already performed in board_initialize.

configs/sam3u-ek/src/sam_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -101,14 +102,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef NSH_HAVE_MMCSD
   FAR struct sdio_dev_s *sdio;

configs/sam4e-ek/src/sam_boot.c

@@ -152,7 +152,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif /* CONFIG_BOARD_INITIALIZE */

configs/sam4e-ek/src/sam_nsh.c

@@ -46,6 +46,8 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -61,14 +63,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_AT25) || defined(HAVE_HSMCI) || defined(HAVE_USBMONITOR)
   int ret;

configs/sam4l-xplained/src/sam_nsh.c

@@ -42,6 +42,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #include "sam4l-xplained.h"
 
 /****************************************************************************
@@ -74,14 +76,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(CONFIG_SAM34_LCDCA) && defined(CONFIG_SAM4L_XPLAINED_SLCD1MODULE)
   /* Initialize the SLCD and register the SLCD device as /dev/slcd */

configs/sam4s-xplained-pro/src/sam_nsh.c

@@ -49,6 +49,7 @@
 #include <unistd.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/board.h>
 
 #ifdef CONFIG_CDCACM
 #  include <nuttx/usb/cdcacm.h>
@@ -77,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined (HAVE_USBDEV) || defined(HAVE_HSMCI) || defined (HAVE_PROC) || \
     defined(HAVE_USBMONITOR)

configs/sama5d3-xplained/src/sam_boot.c

@@ -153,7 +153,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif /* CONFIG_BOARD_INITIALIZE */

configs/sama5d3-xplained/src/sam_nsh.c

@@ -46,6 +46,8 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -61,14 +63,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_NAND) || defined(HAVE_AT25) || defined(HAVE_HSMCI) || \
     defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(CONFIG_AJOYSTICK)

configs/sama5d3-xplained/src/sama5d3-xplained.h

@@ -733,24 +733,6 @@ int sam_usbhost_initialize(void);
 void weak_function sam_netinitialize(void);
 #endif
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 /************************************************************************************
  * Name: board_adc_initialize
  *

configs/sama5d3x-ek/src/sam_boot.c

@@ -153,7 +153,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif /* CONFIG_BOARD_INITIALIZE */

configs/sama5d3x-ek/src/sam_nsh.c

@@ -46,6 +46,8 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -61,14 +63,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_NAND)  || defined(HAVE_AT25)    || defined(HAVE_AT24)       || \
     defined(HAVE_HSMCI) || defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) ||\

configs/sama5d3x-ek/src/sama5d3x-ek.h

@@ -843,24 +843,6 @@ void weak_function sam_netinitialize(void);
 int sam_wm8904_initialize(int minor);
 #endif /* HAVE_WM8904 */
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H */
 

configs/sama5d4-ek/src/sam_nsh.c

@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/board.h>
+
 #include "sama5d4-ek.h"
 
 #ifndef CONFIG_BUILD_KERNEL
@@ -52,14 +54,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifndef CONFIG_BOARD_INITIALIZE
   /* Perform board initialization */

configs/sama5d4-ek/src/sama5d4-ek.h

@@ -1068,24 +1068,6 @@ int sam_usbhost_initialize(void);
 void weak_function sam_netinitialize(void);
 #endif
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 /****************************************************************************
  * Name: sam_wm8904_initialize
  *

configs/samd20-xplained/src/sam_nsh.c

@@ -42,6 +42,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <nuttx/board.h>
+
 #include "sam_config.h"
 #include "samd20-xplained.h"
 
@@ -96,14 +98,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(SAMD_HAVE_SPI0) && defined(CONFIG_SAMD20_XPLAINED_IOMODULE)
   /* Initialize the SPI-based MMC/SD slot */

configs/samv71-xult/src/sam_nsh.c

@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/board.h>
+
 #include "samv71-xult.h"
 
 #if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BUILD_KERNEL)
@@ -52,14 +54,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifndef CONFIG_BOARD_INITIALIZE
   /* Perform board initialization */

configs/shenzhou/src/stm32_composite.c

@@ -70,8 +70,8 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see
+   * stm32_nsh.c).  In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
    * was built.

configs/shenzhou/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 #include "shenzhou-internal.h"
 
@@ -149,14 +151,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_MMCSD) || defined(HAVE_USBHOST) || defined(HAVE_W25)
   int ret;

configs/shenzhou/src/stm32_usbmsc.c

@@ -71,8 +71,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see
+   * stm32_nsh.c).  In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/spark/include/board.h

@@ -255,25 +255,6 @@ void up_setleds(uint8_t ledset, uint8_t led_states_set);
 
 void stm32_boardinitialize(void);
 
-/************************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n:
- *     Called from board_initialize().
- *
- ************************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 #undef EXTERN
 #if defined(__cplusplus)
 }

configs/spark/src/stm32_boot.c

@@ -125,7 +125,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  nsh_archinitialize();
+  board_app_initialize();
 #endif
 
   /* CC3000 wireless initialization

configs/spark/src/stm32_composite.c

@@ -282,7 +282,7 @@ static int do_composite_archinitialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization

configs/spark/src/stm32_nsh.c

@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 
 #ifdef CONFIG_MTD_SST25
@@ -124,14 +125,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef HAVE_SST25
   FAR struct spi_dev_s *spi;
@@ -289,6 +290,6 @@ int usbmsc_archinitialize(void)
 #if defined(CONFIG_NSH_ARCHINIT)
   return OK;
 #else
- return nsh_archinitialize();
+ return board_app_initialize();
 #endif
 }

configs/stm3210e-eval/src/stm32_composite.c

@@ -90,8 +90,8 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see stm32_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see
+   * stm32_nsh.c).  In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
    * was built.

configs/stm3210e-eval/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd/mtd.h>
@@ -109,14 +111,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef CONFIG_STM32_SPI1
   FAR struct spi_dev_s *spi;

configs/stm3210e-eval/src/stm32_usbmsc.c

@@ -89,8 +89,8 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see up_nsh.c).  In
-   * this case, there is nothing further to be done here.
+   * already have been initialized in board_app_initialize() (see up_nsh.c).
+   * In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS

configs/stm3220g-eval/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd/mtd.h>
@@ -122,14 +124,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef CONFIG_STM32_SPI1
   FAR struct spi_dev_s *spi;

configs/stm3240g-eval/src/stm3240g-eval.h

@@ -380,24 +380,5 @@ void stm32_selectlcd(void);
 void stm32_deselectlcd(void);
 #endif
 
-/****************************************************************************
- * Name: nsh_archinitialize
- *
- * Description:
- *   Perform architecture specific initialization for NSH.
- *
- *   CONFIG_NSH_ARCHINIT=y :
- *     Called from the NSH library
- *
- *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_NSH_ARCHINIT=n :
- *     Called from board_initialize().
- *
- ****************************************************************************/
-
-#ifdef CONFIG_NSH_LIBRARY
-int nsh_archinitialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_STM3240G_EVAL_SRC_STM3240G_EVAL_H */

configs/stm3240g-eval/src/stm32_boot.c

@@ -161,10 +161,10 @@ static int board_initthread(int argc, char *argv[])
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  ret = nsh_archinitialize();
+  ret = board_app_initialize();
   if (ret < 0)
     {
-      gdbg("ERROR: nsh_archinitialize failed: %d\n", ret);
+      gdbg("ERROR: board_app_initialize failed: %d\n", ret);
     }
 #endif
 

configs/stm3240g-eval/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd/mtd.h>
@@ -128,14 +130,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef CONFIG_STM32_SPI1
   FAR struct spi_dev_s *spi;

configs/stm32_tiny/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #include "stm32.h"
 #include "stm32_tiny-internal.h"
 
@@ -56,14 +58,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(CONFIG_WL_NRF24L01)
   syslog(LOG_INFO, "Register the nRF24L01 module");

configs/stm32f3discovery/src/stm32_nsh.c

@@ -44,6 +44,8 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
@@ -87,14 +89,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #ifdef HAVE_USBMONITOR
   int ret;

configs/stm32f429i-disco/src/stm32_boot.c

@@ -133,7 +133,7 @@ void board_initialize(void)
    */
 
 #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  (void)nsh_archinitialize();
+  (void)board_app_initialize();
 #endif
 }
 #endif

configs/stm32f429i-disco/src/stm32_nsh.c

@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <errno.h>
 
+#include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
 
 #ifdef CONFIG_STM32_SPI4
@@ -117,7 +118,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_archinitialize
+ * Name: board_app_initialize
  *
  * Description:
  *   Perform architecture specific initialization
@@ -131,7 +132,7 @@
  *
  ****************************************************************************/
 
-int nsh_archinitialize(void)
+int board_app_initialize(void)
 {
 #if defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR)
   int ret;