SAM4E-EK: CMCC is enabled in all configurations and delay loop has been calibrated

4 files changed, 23 insertions, 10 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index d94853054..36e3a796f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7052,4 +7052,6 @@
 	* 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).
+	  CPU speed and with the CMCC enabled.  Calibrated delay loop
+	  (2014-3-26).
+
diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt
index 2968d7cde..fc1086aa2 100644
--- a/nuttx/configs/sam4e-ek/README.txt
+++ b/nuttx/configs/sam4e-ek/README.txt
@@ -1139,7 +1139,9 @@ Configurations
 
     NOTES:
 
-    1. This configuration runs with a CPU clock of 120MHz
+    1. This configuration runs with a CPU clock of 120MHz and with the
+       the CMCC enabled.  If you disable these, then you must also
+       re-calibrate the delay loop.
 
     2. Default stack sizes are large and should really be tuned to reduce
        the RAM footprint:
@@ -1247,7 +1249,7 @@ Configurations
 
     STATUS:
       2014-3-23: This configuration appears to be fully functional.
-      
+
     NOTES:
 
     1. See the NOTES in the description of the nsh configuration.  Those
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig
index 18da06551..1d4aa3cee 100644
--- a/nuttx/configs/sam4e-ek/nsh/defconfig
+++ b/nuttx/configs/sam4e-ek/nsh/defconfig
@@ -110,16 +110,15 @@ CONFIG_ARCH_HAVE_MPU=y
 # ARMV7M Configuration Options
 #
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
-CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
-# CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
 CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
@@ -184,7 +183,7 @@ CONFIG_ARCH_CHIP_SAM4E=y
 # CONFIG_SAM34_CAN0 is not set
 # CONFIG_SAM34_CAN1 is not set
 # CONFIG_SAM34_CHIPID is not set
-# CONFIG_SAM34_CMCC is not set
+CONFIG_SAM34_CMCC=y
 # CONFIG_SAM34_DACC is not set
 # CONFIG_SAM34_EIC is not set
 CONFIG_SAM34_DMAC0=y
@@ -282,7 +281,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 # Board Settings
 #
-CONFIG_BOARD_LOOPSPERMSEC=8720
+CONFIG_BOARD_LOOPSPERMSEC=11990
 # CONFIG_ARCH_CALIBRATION is not set
 
 #
diff --git a/nuttx/configs/sam4e-ek/usbnsh/defconfig b/nuttx/configs/sam4e-ek/usbnsh/defconfig
index 03d290165..92e94d490 100644
--- a/nuttx/configs/sam4e-ek/usbnsh/defconfig
+++ b/nuttx/configs/sam4e-ek/usbnsh/defconfig
@@ -12,6 +12,10 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+# CONFIG_WINDOWS_CYGWIN is not set
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -105,10 +109,16 @@ CONFIG_ARCH_HAVE_MPU=y
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
 CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
@@ -174,7 +184,7 @@ CONFIG_ARCH_CHIP_SAM4E=y
 # CONFIG_SAM34_CAN0 is not set
 # CONFIG_SAM34_CAN1 is not set
 # CONFIG_SAM34_CHIPID is not set
-# CONFIG_SAM34_CMCC is not set
+CONFIG_SAM34_CMCC=y
 # CONFIG_SAM34_DACC is not set
 # CONFIG_SAM34_EIC is not set
 CONFIG_SAM34_DMAC0=y
@@ -276,7 +286,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 # Board Settings
 #
-CONFIG_BOARD_LOOPSPERMSEC=8720
+CONFIG_BOARD_LOOPSPERMSEC=11990
 # CONFIG_ARCH_CALIBRATION is not set
 
 #