SAM configurations: don't use 3 memory regions unless SMC is enabled

6 files changed, 26 insertions, 6 deletions

diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index c1193b831..065c01d89 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -16,6 +16,7 @@ Contents
   - NXFLAT Toolchain
   - AtmelStudio6.1
   - LEDs
+  - Serial Console
   - SAM3U-EK-specific Configuration Options
   - Configurations
 
@@ -267,8 +268,27 @@ LEDs
     on a small proportion of the time.
 *** LED2 may also flicker normally if signals are processed.
 
+Serial Console
+^^^^^^^^^^^^^^
+
+  By default, all of these configurations use UART0 for the NuttX serial
+  console.  UART0 corresponds to the DB-9 connector labelled "UART".  This
+  is a male connector and will require a female-to-female, NUL modem cable
+  to connect to a PC.
+
+  An alternate is USART1 which connects to the other DB-9 connector labeled
+  "USART".  USART1 is not enabled by default unless specifically noted
+  otherwise in the configuration description.  A NUL modem cable must be
+  used with the port as well.
+
+  NOTE:  One of the USART1 pins is shared with the audio CODEC.  The audio
+  CODEC cannot be used of USART1 is enabled.
+
+  By default serial console is configured for 115000, 8-bit, 1 stop bit, and
+  no parity.
+
 SAM3U-EK-specific Configuration Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
        be set to:
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index f5fb5d86d..044843ab6 100644
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -411,7 +411,7 @@ CONFIG_MM_MULTIHEAP=y
 CONFIG_MM_KERNEL_HEAP=y
 CONFIG_MM_KERNEL_HEAPSIZE=8192
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
+CONFIG_MM_REGIONS=2
 # CONFIG_GRAN is not set
 
 #
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 07edb61d3..efe33a84e 100644
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -403,7 +403,7 @@ CONFIG_FS_FAT=y
 #
 # CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
+CONFIG_MM_REGIONS=2
 # CONFIG_GRAN is not set
 
 #
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 327053a8c..8611f1e1a 100644
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -460,7 +460,7 @@ CONFIG_NXFONT_SANS23X27=y
 #
 # CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
+CONFIG_MM_REGIONS=2
 # CONFIG_GRAN is not set
 
 #
diff --git a/nuttx/configs/sam3u-ek/nxwm/defconfig b/nuttx/configs/sam3u-ek/nxwm/defconfig
index 086a39925..923528106 100644
--- a/nuttx/configs/sam3u-ek/nxwm/defconfig
+++ b/nuttx/configs/sam3u-ek/nxwm/defconfig
@@ -523,7 +523,7 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
+CONFIG_MM_REGIONS=2
 # CONFIG_GRAN is not set
 
 #
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index ec0780d51..099158ea9 100644
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -375,7 +375,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 # CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
+CONFIG_MM_REGIONS=2
 # CONFIG_GRAN is not set
 
 #