SAM4E-EK: All configurations converted to run with 120MHz CPU clock

4 files changed, 71 insertions, 58 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 45ca8e8b7..d94853054 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7045,8 +7045,11 @@
 	  allows me to remove so kludge logic to "deparent" the pthread on
 	  startup (2014-3-25).
 	* tools/astyle.sh:  A code formatting tool from Lorenz Meier.  This
-	  tool should do a better job than the old tools/indent.sh tool.
+	  tool should do a better job than the old tools/indent.sh tool
+	(2014-3-26).
 	* arch/arm/src/sam_hsmci.c and sam_spi.c:  Add support to invalidate
 	  cached memory if the CMCC is enabled (not yet tested, 2014-3-26).
 	* arch/arm/src/sam_spi.c:  Add logic to handle SPI word widths > 8
 	  (also untested on initial checkin, 2014-3-26).
+	* configs/sam4e-ek:  All configurations updated to run with 120MHz
+	  CPU speed (2014-3-26).
diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt
index b2cebd03b..2968d7cde 100644
--- a/nuttx/configs/sam4e-ek/README.txt
+++ b/nuttx/configs/sam4e-ek/README.txt
@@ -677,6 +677,8 @@ USB Full-Speed Device
               USB data capture.  Testing is insufficient.  This needs to
               be revisited.
 
+              Last tested at 96MHz with the CMCC disabled.
+
   CDC/ACM Serial Device Class
   ---------------------------
 
@@ -837,6 +839,9 @@ HSMCI
      sheet only discusses PDC-based HSMCI DMA (although there is a DMA
      channel interface definition for HSMCI).
 
+     Bottom line:  Untested and probably not usable on the SAM4E-EK in its
+     current form.
+
 Touchscreen
 ===========
 
@@ -1134,7 +1139,9 @@ Configurations
 
     NOTES:
 
-    1. Default stack sizes are large and should really be tuned to reduce
+    1. This configuration runs with a CPU clock of 120MHz
+
+    2. Default stack sizes are large and should really be tuned to reduce
        the RAM footprint:
 
          CONFIG_ARCH_INTERRUPTSTACK=2048
@@ -1143,7 +1150,7 @@ Configurations
          CONFIG_PTHREAD_STACK_DEFAULT=2048
          ... and others ...
 
-    2. NSH built-in applications are supported.
+    3. NSH built-in applications are supported.
 
        Binary Formats:
          CONFIG_BUILTIN=y                    : Enable support for built-in programs
@@ -1151,7 +1158,7 @@ Configurations
        Applicaton Configuration:
          CONFIG_NSH_BUILTIN_APPS=y           : Enable starting apps from NSH command line
 
-    3. This configuration has the network enabled by default.  This can be
+    4. This configuration has the network enabled by default.  This can be
        easily disabled or reconfigured (See see the network related
        configuration settings above in the section entitled "Networking").
 
@@ -1171,7 +1178,7 @@ Configurations
        2014-3-13: The basic NSH serial console is working.  Network support
                   has been verified.
 
-    4. This configuration supports a network with fixed IP address.  You
+    5. This configuration supports a network with fixed IP address.  You
        may have to change these settings for your network:
 
        CONFIG_NSH_IPADDR=0x0a000002        : IP address: 10.0.0.2
@@ -1187,7 +1194,7 @@ Configurations
        CONFIG_NSH_DHCPC=y                  : Tells NSH to use DHCPC, not
                                            : the fixed addresses
 
-    5. This configuration has the DMA-based SPI0 and AT25 Serial FLASH
+    6. This configuration has the DMA-based SPI0 and AT25 Serial FLASH
        support enabled by default.  This can be easily disabled or
        reconfigured (See see the configuration settings and usage notes
        above in the section entitled "AT25 Serial FLASH").
@@ -1200,7 +1207,7 @@ Configurations
        2014-3-14: The DMA-based SPI appears to be functional and can be used
                   to support a FAT file system on the AT25 Serial FLASH.
 
-    6. USB device support is not enabled in this configuration by default.
+    7. USB device support is not enabled in this configuration by default.
        To add USB device support to this configuration, see the instructions
        above under "USB Full-Speed Device."
 
@@ -1213,14 +1220,14 @@ Configurations
                   does not mount on either the Linux or Windows host.  This
                   needs to be retested.
 
-    7. This configuration can be used to verify the touchscreen on on the
+    8. This configuration can be used to verify the touchscreen on on the
        SAM4E-EK LCD.  See the instructions above in the paragraph entitled
        "Touchscreen".
 
        STATUS:
          2014-3-21:  The touchscreen has not yet been tested.
 
-    8. Enabling HSMCI support. The SAM3U-KE provides a an SD memory card
+    9. Enabling HSMCI support. The SAM3U-KE provides a an SD memory card
        slot.  Support for the SD slot can be enabled following the
        instructions provided above in the paragraph entitled "HSMCI."
 
@@ -1272,8 +1279,9 @@ Configurations
           next note.
 
     3. If you send large amounts of data to the target, you may see data
-       loss due to RX overrun errors.  See the NOTES in the section entitle
-       "CDC/ACM Serial Device Class" for some possible work-arounds.
+       loss due to RX overrun errors.  See the NOTES in the section entitled
+       "CDC/ACM Serial Device Class" for an explanation and some possible
+       work-arounds.
 
     3. This configuration does have UART0 output enabled and set up as
        the system logging device:
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig
index aaac295e0..18da06551 100644
--- a/nuttx/configs/sam4e-ek/nsh/defconfig
+++ b/nuttx/configs/sam4e-ek/nsh/defconfig
@@ -120,7 +120,6 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
-# CONFIG_SAM34_GPIO_IRQ is not set
 CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
@@ -230,6 +229,7 @@ CONFIG_SAM34_USART1=y
 #
 # AT91SAM3/4 GPIO Interrupt Configuration
 #
+# CONFIG_SAM34_GPIO_IRQ is not set
 
 #
 # AT91SAM3/4 SPI device driver options
@@ -330,8 +330,8 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
-CONFIG_SAM4EEK_96MHZ=y
-# CONFIG_SAM4EEK_120MHZ is not set
+# CONFIG_SAM4EEK_96MHZ is not set
+CONFIG_SAM4EEK_120MHZ=y
 CONFIG_SAM4EEK_AT25_AUTOMOUNT=y
 CONFIG_SAM4EEK_AT25_FTL=y
 
@@ -434,6 +434,7 @@ CONFIG_MTD=y
 # MTD Configuration
 #
 # CONFIG_MTD_PARTITION is not set
+# CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
 # CONFIG_MTD_CONFIG is not set
 # CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
@@ -929,26 +930,14 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 #
 
 #
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
 #
-# I2C tool
-#
-
-#
-# INI File Parser
+# EMACS-like Command Line Editor
 #
-# CONFIG_SYSTEM_INIFILE is not set
+# CONFIG_SYSTEM_CLE is not set
 
 #
 # FLASH Program Installation
@@ -961,6 +950,15 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 
 #
+# I2C tool
+#
+
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
+#
 # NxPlayer media player library / command Line
 #
 # CONFIG_SYSTEM_NXPLAYER is not set
@@ -997,21 +995,20 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_SYSTEM_SYSINFO is not set
 
 #
-# USB Monitor
+# VI Work-Alike Editor
 #
+# CONFIG_SYSTEM_VI is not set
 
 #
-# EMACS-like Command Line Editor
+# Stack Monitor
 #
-# CONFIG_SYSTEM_CLE is not set
 
 #
-# VI Work-Alike Editor
+# USB CDC/ACM Device Commands
 #
-# CONFIG_SYSTEM_VI is not set
 
 #
-# Stack Monitor
+# USB Composite Device Commands
 #
 
 #
@@ -1019,6 +1016,10 @@ CONFIG_READLINE_ECHO=y
 #
 
 #
+# USB Monitor
+#
+
+#
 # Zmodem Commands
 #
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sam4e-ek/usbnsh/defconfig b/nuttx/configs/sam4e-ek/usbnsh/defconfig
index d2636b99b..03d290165 100644
--- a/nuttx/configs/sam4e-ek/usbnsh/defconfig
+++ b/nuttx/configs/sam4e-ek/usbnsh/defconfig
@@ -110,7 +110,6 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
-# CONFIG_SAM34_GPIO_IRQ is not set
 CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
@@ -220,6 +219,7 @@ CONFIG_SAM34_USART1=y
 #
 # AT91SAM3/4 GPIO Interrupt Configuration
 #
+# CONFIG_SAM34_GPIO_IRQ is not set
 
 #
 # AT91SAM3/4 SPI device driver options
@@ -324,8 +324,8 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
-CONFIG_SAM4EEK_96MHZ=y
-# CONFIG_SAM4EEK_120MHZ is not set
+# CONFIG_SAM4EEK_96MHZ is not set
+CONFIG_SAM4EEK_120MHZ=y
 CONFIG_SAM4EEK_AT25_AUTOMOUNT=y
 CONFIG_SAM4EEK_AT25_FTL=y
 
@@ -428,6 +428,7 @@ CONFIG_MTD=y
 # MTD Configuration
 #
 # CONFIG_MTD_PARTITION is not set
+# CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
 # CONFIG_MTD_CONFIG is not set
 # CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
@@ -967,27 +968,14 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 #
 
 #
-# USB CDC/ACM Device Commands
-#
-# CONFIG_SYSTEM_CDCACM is not set
-
-#
-# USB Composite Device Commands
-#
-
-#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
 #
-# I2C tool
-#
-
-#
-# INI File Parser
+# EMACS-like Command Line Editor
 #
-# CONFIG_SYSTEM_INIFILE is not set
+# CONFIG_SYSTEM_CLE is not set
 
 #
 # FLASH Program Installation
@@ -1000,6 +988,15 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 
 #
+# I2C tool
+#
+
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
+#
 # NxPlayer media player library / command Line
 #
 # CONFIG_SYSTEM_NXPLAYER is not set
@@ -1036,21 +1033,21 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_SYSTEM_SYSINFO is not set
 
 #
-# USB Monitor
+# VI Work-Alike Editor
 #
+# CONFIG_SYSTEM_VI is not set
 
 #
-# EMACS-like Command Line Editor
+# Stack Monitor
 #
-# CONFIG_SYSTEM_CLE is not set
 
 #
-# VI Work-Alike Editor
+# USB CDC/ACM Device Commands
 #
-# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_CDCACM is not set
 
 #
-# Stack Monitor
+# USB Composite Device Commands
 #
 
 #
@@ -1058,6 +1055,10 @@ CONFIG_READLINE_ECHO=y
 #
 
 #
+# USB Monitor
+#
+
+#
 # Zmodem Commands
 #
 # CONFIG_SYSTEM_ZMODEM is not set