From 633e90225e07843bf589fcebbf4aa7b162cf8a42 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 25 Jan 2018 10:04:00 -0600
Subject: [PATCH] configs/flipnclick-sam3x (also Arduio-Due): Remove disabling
 of environmont, mountpoints, and poll.  Add NSH arch initialization so that
 procfs will be automounted.  Increase task name size from 0 to 32.  Update
 README.

---
 configs/arduino-due/nsh/defconfig      | 6 ++----
 configs/flipnclick-sam3x/README.txt    | 7 ++++---
 configs/flipnclick-sam3x/nsh/defconfig | 6 ++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 15814e72310..a791c14a5b1 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -11,9 +11,6 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_BOARD_LOOPSPERMSEC=6965
 CONFIG_BUILTIN=y
 CONFIG_CXX_NEWLONG=y
-CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_MOUNTPOINT=y
-CONFIG_DISABLE_POLL=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
 CONFIG_FS_PROCFS=y
@@ -24,6 +21,7 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
+CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
@@ -40,7 +38,7 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=28
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
-CONFIG_TASK_NAME_SIZE=0
+CONFIG_TASK_NAME_SIZE=32
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/flipnclick-sam3x/README.txt b/configs/flipnclick-sam3x/README.txt
index 8ab7a159a8f..38e9ae2dbbd 100644
--- a/configs/flipnclick-sam3x/README.txt
+++ b/configs/flipnclick-sam3x/README.txt
@@ -349,9 +349,10 @@ Loading Code
 
    You should be able to use a 10- to 20-pin adapter to connect a SAM-ICE
    or J-Link debugger to the Flip&Click SAM3X.  I have this Olimex adapter:
-   https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-20-10/ . But so far I
-   have been unable to get the get the SAM-ICE to communicate with the
-   Flip&Click.
+   https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-20-10/ .  I have been
+   loading code and debugging with no problems using JTAG.
+
+   You can find photos my setup here: http://www.nuttx.org/doku.php?id=wiki:howtos:flipnclick-sam3x
 
 Flip&Click SAM3X-specific Configuration Options
 ===============================================
diff --git a/configs/flipnclick-sam3x/nsh/defconfig b/configs/flipnclick-sam3x/nsh/defconfig
index f0ba4aedf39..68e1421dc1c 100644
--- a/configs/flipnclick-sam3x/nsh/defconfig
+++ b/configs/flipnclick-sam3x/nsh/defconfig
@@ -9,9 +9,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH="arm"
 CONFIG_BOARD_LOOPSPERMSEC=6965
 CONFIG_BUILTIN=y
-CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_MOUNTPOINT=y
-CONFIG_DISABLE_POLL=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
 CONFIG_FS_PROCFS=y
@@ -23,6 +20,7 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
+CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
@@ -40,7 +38,7 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=28
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2013
-CONFIG_TASK_NAME_SIZE=0
+CONFIG_TASK_NAME_SIZE=32
 CONFIG_USART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0