1 files changed, 7 insertions, 129 deletions
diff --git a/nuttx/configs/sama5d4-ek/src/sam_nsh.c b/nuttx/configs/sama5d4-ek/src/sam_nsh.c
index 8a4a3efb8..234e8b0a7 100644
--- a/nuttx/configs/sama5d4-ek/src/sam_nsh.c
+++ b/nuttx/configs/sama5d4-ek/src/sam_nsh.c
@@ -39,39 +39,14 @@
 
 #include <nuttx/config.h>
 
-#include <sys/mount.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <errno.h>
-#include <debug.h>
-
-#ifdef CONFIG_SYSTEM_USBMONITOR
-#  include <apps/usbmonitor.h>
-#endif
-
 #include "sama5d4-ek.h"
 
+#ifndef CONFIG_BUILD_KERNEL
+
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
 
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-#  ifdef CONFIG_DEBUG
-#    define message(...) syslog(__VA_ARGS__)
-#  else
-#    define message(...) printf(__VA_ARGS__)
-#  endif
-#else
-#  ifdef CONFIG_DEBUG
-#    define message syslog
-#  else
-#    define message printf
-#  endif
-#endif
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -86,108 +61,11 @@
 
 int nsh_archinitialize(void)
 {
-#if defined(HAVE_NAND)    || defined(HAVE_AT25)       || defined(HAVE_HSMCI)  || \
-    defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(HAVE_WM8904) || \
-    defined(HAVE_AUTOMOUNTER)
-  int ret;
-#endif
-
-#ifdef HAVE_NAND
-  /* Initialize the NAND driver */
-
-  ret = sam_nand_automount(NAND_MINOR);
-  if (ret < 0)
-    {
-      message("ERROR: sam_nand_automount failed: %d\n", ret);
-    }
-#endif
-
-#ifdef HAVE_AT25
-  /* Initialize the AT25 driver */
-
-  ret = sam_at25_automount(AT25_MINOR);
-  if (ret < 0)
-    {
-      message("ERROR: sam_at25_automount failed: %d\n", ret);
-    }
-#endif
-
-#ifdef HAVE_HSMCI
-#ifdef CONFIG_SAMA5_HSMCI0
-  /* Initialize the HSMCI0 driver */
-
-  ret = sam_hsmci_initialize(HSMCI0_SLOTNO, HSMCI0_MINOR);
-  if (ret < 0)
-    {
-      message("ERROR: sam_hsmci_initialize(%d,%d) failed: %d\n",
-              HSMCI0_SLOTNO, HSMCI0_MINOR, ret);
-    }
-#endif
-
-#ifdef CONFIG_SAMA5_HSMCI1
-  /* Initialize the HSMCI1 driver */
+#ifndef CONFIG_BOARD_INITIALIZE
+  /* Perform board initialization */
 
-  ret = sam_hsmci_initialize(HSMCI1_SLOTNO, HSMCI1_MINOR);
-  if (ret < 0)
-    {
-      message("ERROR: sam_hsmci_initialize(%d,%d) failed: %d\n",
-              HSMCI1_SLOTNO, HSMCI1_MINOR, ret);
-    }
+  (void)sam_bringup();
 #endif
-#endif
-
-#ifdef HAVE_AUTOMOUNTER
-  /* Initialize the auto-mounter */
-
-  sam_automount_initialize();
-#endif
-
-#ifdef HAVE_USBHOST
-  /* Initialize USB host operation.  sam_usbhost_initialize() starts a thread
-   * will monitor for USB connection and disconnection events.
-   */
-
-  ret = sam_usbhost_initialize();
-  if (ret != OK)
-    {
-      message("ERROR: Failed to initialize USB host: %d\n", ret);
-    }
-#endif
-
-#ifdef HAVE_USBMONITOR
-  /* Start the USB Monitor */
-
-  ret = usbmonitor_start(0, NULL);
-  if (ret != OK)
-    {
-      message("ERROR: Failed to start the USB monitor: %d\n", ret);
-    }
-#endif
-
-#ifdef HAVE_WM8904
-  /* Configure WM8904 audio */
-
-  ret = sam_wm8904_initialize(0);
-  if (ret != OK)
-    {
-      message("ERROR: Failed to initialize WM8904 audio: %d\n", ret);
-    }
-#endif
-
-#ifdef HAVE_AUDIO_NULL
-  /* Configure the NULL audio device */
-
-  ret = sam_audio_null_initialize(0);
-  if (ret != OK)
-    {
-      message("ERROR: Failed to initialize the NULL audio device: %d\n", ret);
-    }
-#endif
-
-  /* If we got here then perhaps not all initialization was successful, but
-   * at least enough succeeded to bring-up NSH with perhaps reduced
-   * capabilities.
-   */
-
-  return OK;
 }
+
+#endif /* CONFIG_BUILD_KERNEL */