Calibrate lm3s6918 timing loop

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1792 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 46 insertions, 8 deletions

diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index f67351e45..995a319e6 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -52,10 +52,6 @@
  * Definitions
  ****************************************************************************/
 
-/* Define to enable timing loop calibration */
-
-#undef CONFIG_ARM_CALIBRATION
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -74,16 +70,16 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARM_CALIBRATION) & defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
 static void up_calibratedelay(void)
 {
   int i;
-  slldbg("Beginning 100s delay\n");
+  lldbg("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
-  slldbg("End 100s delay\n");
+  lldbg("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/nuttx/configs/c5471evm/README.txt b/nuttx/configs/c5471evm/README.txt
index 0c479a89c..f984a6a90 100644
--- a/nuttx/configs/c5471evm/README.txt
+++ b/nuttx/configs/c5471evm/README.txt
@@ -81,6 +81,13 @@ ARM/C5471-specific Configuration Options
 
 	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
+	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+	   cause a 100 second delay during boot-up.  This 100 second delay
+	   serves no purpose other than it allows you to calibratre
+	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+	   the delay actually is 100 seconds.
+
   C5471 specific device driver settings
 
 	CONFIG_SERIAL_IRDA_CONSOLE - selects the IRDA UART for the
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index 42fd0256b..8f93fd82d 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -142,6 +142,13 @@ Eagle100-specific Configuration Options
 
 	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
+	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+	   cause a 100 second delay during boot-up.  This 100 second delay
+	   serves no purpose other than it allows you to calibratre
+	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+	   the delay actually is 100 seconds.
+
   LM3S6818 specific device driver settings
 
 	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 6310a02e3..c1a4a760a 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -59,13 +59,19 @@
 # CONFIG_ARCH_BOOTLOADER - Configure to use the MicroMint Eagle-100
 #   Ethernet bootloader.
 # CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+# CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+#   cause a 100 second delay during boot-up.  This 100 second delay
+#   serves no purpose other than it allows you to calibratre
+#   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+#   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+#   the delay actually is 100 seconds.
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CHIP=lm3s
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD=eagle100
 CONFIG_ARCH_BOARD_EAGLE100=y
-CONFIG_BOARD_LOOPSPERMSEC=16945
+CONFIG_BOARD_LOOPSPERMSEC=4531
 CONFIG_DRAM_SIZE=0x00010000
 CONFIG_DRAM_START=0x00000000
 CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
@@ -75,6 +81,7 @@ CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_CALIBRATION=n
 
 #
 # LM3S6918 specific serial device driver settings
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index b7d551964..bceff817c 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -96,6 +96,13 @@ ARM/LPC214X-specific Configuration Options
 
 	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
+	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+	   cause a 100 second delay during boot-up.  This 100 second delay
+	   serves no purpose other than it allows you to calibratre
+	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+	   the delay actually is 100 seconds.
+
   LPC2148 specific chip initialization
 
     These provide register setup values:
diff --git a/nuttx/configs/mx1ads/README.txt b/nuttx/configs/mx1ads/README.txt
index c3cb96527..a270bfa2b 100644
--- a/nuttx/configs/mx1ads/README.txt
+++ b/nuttx/configs/mx1ads/README.txt
@@ -84,6 +84,13 @@ ARM/i.MX1-specific Configuration Options
 
 	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
+	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+	   cause a 100 second delay during boot-up.  This 100 second delay
+	   serves no purpose other than it allows you to calibratre
+	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+	   the delay actually is 100 seconds.
+
   IMX specific device driver settings
 
 	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt
index 1b1c45a4d..2a82b5bbb 100644
--- a/nuttx/configs/ntosd-dm320/README.txt
+++ b/nuttx/configs/ntosd-dm320/README.txt
@@ -83,6 +83,13 @@ ARM/DM320-specific Configuration Options
 
 	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
+	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+	   cause a 100 second delay during boot-up.  This 100 second delay
+	   serves no purpose other than it allows you to calibratre
+	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+	   the delay actually is 100 seconds.
+
   DM320 specific device driver settings
 
 	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the