diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 0f54a3e871d..8eb13e2970b 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -2220,23 +2220,23 @@ The system can be re-made subsequently by just typing <code>make</code>.
 
 <p><b>System Timer</b>
   In most implementations, system time is provided by a timer interrupt.
-  That timer interrupt runs at rate determined by <code>CONFIG_MSEC_PER_TICKS</code> (default 10 or 100Hz).
-  The timer generates an interrupt each <code>CONFIG_MSEC_PER_TICKS</code> milliseconds and increments a counter called <code>g_system_timer</code>.
-  <code>g_system_timer</code> then provides a time-base for calculating <i>up-time</i> and elapsed time intervals in units of <code>CONFIG_MSEC_PER_TICKS</code>.
+  That timer interrupt runs at rate determined by <code>CONFIG_USEC_PER_TICKS</code> (default 10000 microseconds or 100Hz.  If <code>CONFIG_SCHED_TICKLESS</code> is selected, the default is 100 microseconds).
+  The timer generates an interrupt each <code>CONFIG_USEC_PER_TICKS</code> microseconds and increments a counter called <code>g_system_timer</code>.
+  <code>g_system_timer</code> then provides a time-base for calculating <i>up-time</i> and elapsed time intervals in units of <code>CONFIG_USEC_PER_TICKS</code>.
   The range of <code>g_system_timer</code> is, by default, 32-bits.
   However, if the MCU supports type <code>long long</code> and <code>CONFIG_SYSTEM_TIME16</code> is selected,
   a 64-bit system timer will be supported instead.
 </p>
 <p><b>System Timer Accuracy</b>
-  On many system, the exact timer interval specified by <code>CONFIG_MSEC_PER_TICKS</code> cannot be achieved due to limitations in frequencies or in dividers.
-  As a result, the time interval specified by <code>CONFIG_MSEC_PER_TICKS</code> may only be approximate and there may be small errors in the apparent <i>up-time</i> time.
+  On many system, the exact timer interval specified by <code>CONFIG_USEC_PER_TICKS</code> cannot be achieved due to limitations in frequencies or in dividers.
+  As a result, the time interval specified by <code>CONFIG_USEC_PER_TICKS</code> may only be approximate and there may be small errors in the apparent <i>up-time</i> time.
   These small errors, however, will accumulate over time and after a long period of time may have an unacceptably large error in the apparent <i>up-time</i> of the MCU.
 </p>
-  If the timer tick period generated by the hardware is not exactly <code>CONFIG_MSEC_PER_TICKS</code> <i>and</i> if there you require accurate up-time for the MCU, then there are measures that you can take:
+  If the timer tick period generated by the hardware is not exactly <code>CONFIG_USEC_PER_TICKS</code> <i>and</i> if there you require accurate up-time for the MCU, then there are measures that you can take:
 </p>
 <ul>
   <li>
-    Perhaps you can adjust <code>CONFIG_MSEC_PER_TICKS</code> to a different value so that an exactly <code>CONFIG_MSEC_PER_TICKS</code> can be accomplished.
+    Perhaps you can adjust <code>CONFIG_USEC_PER_TICKS</code> to a different value so that an exactly <code>CONFIG_USEC_PER_TICKS</code> can be realized.
   </li>
   <li>
     Or you can use a technique known as <i>Delta-Sigma Modulation</i>. (Suggested by Uros Platise).  Consider the example below.
@@ -2247,7 +2247,7 @@ The system can be re-made subsequently by just typing <code>make</code>.
   Consider this case:  The system timer is a count-up timer driven at 32.768KHz.
   There are dividers that can be used, but a divider of one yields the highest accuracy.
   This counter counts up until the count equals a match value, then a timer interrupt is generated.
-  The desire frequency is 100Hz (<code>CONFIG_MSEC_PER_TICKS</code> is 10).
+  The desire frequency is 100Hz (<code>CONFIG_USEC_PER_TICKS</code> is 10000).
 </p>
 <p>
   This exact frequency of 100Hz cannot be obtained in this case.
diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c
index b12f8e2642c..160c3e6b375 100644
--- a/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/at32uc3/at32uc3_timerisr.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,12 +61,12 @@
  * setting that defaults to 100 (100 ticks per second = 10 MS interval).
  *
  * However, the AVR RTC does not support that default value well and so, we
- * will insist that default is over-ridden by CONFIG_MSEC_PER_TICK in the
- * configuration file.  Further, we will insist that CONFIG_MSEC_PER_TICK
- * have the value 8 (see reasoning below).
+ * will insist that default is over-ridden by CONFIG_USEC_PER_TICK in the
+ * configuration file.  Further, we will insist that CONFIG_USEC_PER_TICK
+ * have the value 10000 (see reasoning below).
  */
 
-#if defined(CONFIG_MSEC_PER_TICK) && CONFIG_MSEC_PER_TICK != 10
+#if defined(CONFIG_USEC_PER_TICK) && CONFIG_USEC_PER_TICK != 10000
 #  error "Only a 100KHz system clock is supported"
 #endif
 
diff --git a/arch/avr/src/at90usb/at90usb_timerisr.c b/arch/avr/src/at90usb/at90usb_timerisr.c
index a6e82b60434..9bd4514e94a 100644
--- a/arch/avr/src/at90usb/at90usb_timerisr.c
+++ b/arch/avr/src/at90usb/at90usb_timerisr.c
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 /* The CPU frequency is given by BOARD_CPU_CLOCK (defined in board.h).  The
- * desired interrupt frequency is given by CONFIG_MSEC_PER_TICK.  An unscaled
+ * desired interrupt frequency is given by CONFIG_USEC_PER_TICK.  An unscaled
  * ideal match is given by:
  *
  *   CLOCK = CPU_CLOCK / DIVISOR                      # CPU clocks/sec
diff --git a/arch/avr/src/atmega/atmega_timerisr.c b/arch/avr/src/atmega/atmega_timerisr.c
index 4c3ada87b1d..069935fb058 100644
--- a/arch/avr/src/atmega/atmega_timerisr.c
+++ b/arch/avr/src/atmega/atmega_timerisr.c
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 /* The CPU frequency is given by BOARD_CPU_CLOCK (defined in board.h).  The
- * desired interrupt frequency is given by CONFIG_MSEC_PER_TICK.  An unscaled
+ * desired interrupt frequency is given by CONFIG_USEC_PER_TICK.  An unscaled
  * ideal match is given by:
  *
  *   CLOCK = CPU_CLOCK / DIVISOR                      # CPU clocks/sec
diff --git a/arch/rgmp/src/rgmp.c b/arch/rgmp/src/rgmp.c
index 495c5e05c97..652e11cca07 100644
--- a/arch/rgmp/src/rgmp.c
+++ b/arch/rgmp/src/rgmp.c
@@ -46,6 +46,8 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/clock.h>
+
 #include <semaphore.h>
 #include <queue.h>
 #include <stdlib.h>
@@ -55,8 +57,8 @@
 int nest_irq = 0;
 
 // the default time is 10ms
-#ifdef CONFIG_MSEC_PER_TICK
-const unsigned int rtos_tick_time = CONFIG_MSEC_PER_TICK;
+#ifdef MSEC_PER_TICK
+const unsigned int rtos_tick_time = MSEC_PER_TICK;
 #else
 const unsigned int rtos_tick_time = 10;
 #endif
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index 10a609d2909..396fe13e79d 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -192,7 +192,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 6cfcbd223f7..823c916ef16 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -155,7 +155,7 @@ CONFIG_ARCH_BOARD="amber"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 9b6c51f276c..3f376b118c6 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -250,7 +250,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 91225516ee8..425aeb269af 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -185,7 +185,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 48a6ba489a4..556391b41ab 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -184,7 +184,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index fa2e6220487..dae30de76c3 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -208,7 +208,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 08384dc4bf7..cedfc4f25a8 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -207,7 +207,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 34d236c40d3..1d3fb01f82a 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -209,7 +209,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 6ed416c9b8f..811fbdb1fc3 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -253,7 +253,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index 9d33cd37cf7..f5804939dac 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -191,7 +191,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index b74e6bfada5..7dd3a4d8e47 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -206,7 +206,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index 31bacebac92..ad634c52a5a 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -209,7 +209,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index e1a2a4ec55d..7045905da99 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -209,7 +209,7 @@ CONFIG_COMPALE99_LCD_SSD1783=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index f3226347693..725d84a3299 100644
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -164,7 +164,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 22e69dfcf61..e7ed6309062 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -209,7 +209,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index fb5e0010b99..54715ec15e7 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -248,7 +248,7 @@ CONFIG_EA3131_PAGING_SPIPORT=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index e2d3dd56bdf..bc1fb69ef33 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -230,7 +230,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index d9154ec9439..c39243be0aa 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -223,7 +223,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 8b3a209cb34..6b1ca1a1562 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -246,7 +246,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index d723dc78658..d06210fb09d 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -272,7 +272,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index bc93ed62c2a..42f38361059 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -252,7 +252,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 10c2aaa5ad3..c02753be474 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -234,7 +234,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 4d035868239..f1176dc93fc 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -239,7 +239,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 0b32ad2e6de..8b8a4021c00 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -238,7 +238,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index cc866ddd4be..1df0b79272f 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -207,7 +207,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 98f4e968650..41dc993c9c6 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -233,7 +233,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 48aef09aad0..14a35bc60cb 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -234,7 +234,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 65553e2f848..839c715d292 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -233,7 +233,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index deec47ea3cd..a4c42efb81e 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -235,7 +235,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 9aa80091f69..d5912e1daee 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -234,7 +234,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 2bcb9bf1fad..762b9d470de 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -247,7 +247,7 @@ CONFIG_ARCH_BOARD_FIRE_STM32V2=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 24e859bc3b0..ae20fd0fafa 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -210,7 +210,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index b8ca2777c3e..79c3d5e2de7 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -215,7 +215,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 41d8bdeeeb3..0a74791fcea 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -270,7 +270,7 @@ CONFIG_ARCH_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 3329a5ac304..2020e8b1c5b 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -281,7 +281,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index c8ca2b67907..0ea94481717 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -295,7 +295,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index 4b3c6d1599c..af3281af421 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -358,7 +358,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index c4866289ece..b908fe63e15 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -271,7 +271,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 7e9f1dbbd4b..e3a5967a567 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -349,7 +349,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 39ff29145f9..a5e175d46ba 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -226,7 +226,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index f54880b8d03..a11dbb84a03 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -258,7 +258,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 634fa10df8f..7f9cd079465 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -235,7 +235,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=10
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 0baec5b8b34..33dc5982069 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -244,7 +244,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 0baec5b8b34..33dc5982069 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -244,7 +244,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index ecfe5f4f6e6..bb236d76a02 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -226,7 +226,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index 51b322ab71e..9ef928a898f 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -263,7 +263,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 4f7789e622d..96080de4548 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -252,7 +252,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 45febb5a6d4..cd5fe949758 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -234,7 +234,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 340295bd385..cd232a3208f 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -236,7 +236,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index 3079a80f221..6df2f760e2e 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -264,7 +264,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index e7e14f1e5ba..b9d4c828b9a 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -281,7 +281,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index b03d2f9e30d..e2d893d47be 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -283,7 +283,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index a9176137e23..da9bc9b4e86 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -270,7 +270,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 18ef5421eec..c35798a4c2a 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -281,7 +281,7 @@ CONFIG_DISABLE_MQUEUE=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 5b17b45f440..1f2bdda8844 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -281,7 +281,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 6b3f6ce454a..ec2b4bf852e 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -337,7 +337,7 @@ CONFIG_MAPLE_MINI=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index f1f5b55330f..93c479e2b61 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -361,7 +361,7 @@ CONFIG_MAPLE_MINI=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 402e4dc05e1..fa01a429606 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -337,7 +337,7 @@ CONFIG_MAPLE_MINI=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 30d281834c2..55b5a118fae 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -270,7 +270,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 1727ac9e510..473380d0acb 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -260,7 +260,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 737ec65c6b7..3020763b42a 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -216,7 +216,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 88d14c24113..1f79f478cc6 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -174,7 +174,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 49b1141d01c..b315b8ed822 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -215,7 +215,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 8c20ea6f456..b9613f96365 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -216,7 +216,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index eb82914b83f..fab5d8c3153 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -163,7 +163,7 @@ CONFIG_ARCH_BOARD="micropendous3"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 5e81ecd1f5b..524c67b59b7 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -412,7 +412,7 @@ CONFIG_MIKROE_FLASH_PART_LIST="8,248,768"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 39e660408bf..e1ae1fcb950 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -386,7 +386,7 @@ CONFIG_MIKROE_FLASH_PART_LIST="256,768"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 8c8beb9e009..faa57c428dd 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -377,7 +377,7 @@ CONFIG_MIKROE_FLASH_PART_LIST="256,768"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index d8d0b790658..be46deee5ce 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -356,7 +356,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 3125028769b..d27d438cae4 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -356,7 +356,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index ba73f2bef4c..85e5128a21f 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -356,7 +356,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 168e94fe91f..cd412582f72 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -379,7 +379,7 @@ CONFIG_MIKROE_RAMMTD_SIZE=32
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 8800630e7fa..6da9411c8f7 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -319,7 +319,7 @@ CONFIG_MIRTOO_RELEASE=2
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 43c8c03b8b9..d52a089e3b6 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -320,7 +320,7 @@ CONFIG_MIRTOO_RELEASE=2
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 7ca9f08c50b..dae941db84d 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -185,7 +185,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index ab58c80bf49..a86b93597a3 100644
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -164,7 +164,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 3c81781c028..047b3bc17de 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index be2ce7adb76..033d91939ff 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -195,7 +195,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index a8c70280a12..7e49df34b16 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index c3b3c6c23a0..68113b2dcbf 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 1f6ff379c9b..db542d35ae9 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index c6a7ce2453c..3d911a018ab 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig
index 6d679dec049..7c4222ed6c7 100644
--- a/configs/nucleo-f401re/nsh/defconfig
+++ b/configs/nucleo-f401re/nsh/defconfig
@@ -398,7 +398,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index b9dc30d80e7..54a77079181 100644
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -267,7 +267,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig
index 95329799534..4d39ecf35f4 100644
--- a/configs/nucleus2g/usbmsc/defconfig
+++ b/configs/nucleus2g/usbmsc/defconfig
@@ -257,7 +257,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index b74c5b6905c..20b0d6894a2 100644
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -238,7 +238,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 1e3d45607ac..99b50676007 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -231,7 +231,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 896355a85e4..3b8ce6007f1 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -208,7 +208,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 965ea8d460b..48a8c4c938e 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -284,7 +284,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 99ac5877e50..cbe513fb759 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -291,7 +291,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 0b60ed06034..c483b2961ea 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -293,7 +293,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 7c70a3c5d05..68d0a00770e 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index ab6ea6026e5..f559cff8279 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index d08960b7d3e..95692a276ce 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -279,7 +279,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 69967e5f2d8..6f7015ed0ca 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -273,7 +273,7 @@ CONFIG_DISABLE_MQUEUE=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index ca0fafaa924..525f6526122 100644
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_MQUEUE=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 3f6ab42de46..96838b40470 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index f459109a904..65305eaf5df 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 5f754f5118b..a5070f5e095 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -286,7 +286,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index f964b70ad49..2509e5e13ef 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -199,7 +199,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/olimex-stm32-h405/nshusb/defconfig b/configs/olimex-stm32-h405/nshusb/defconfig
index 96956cb7f22..d24b05fcc81 100644
--- a/configs/olimex-stm32-h405/nshusb/defconfig
+++ b/configs/olimex-stm32-h405/nshusb/defconfig
@@ -398,7 +398,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 76931fd4f37..45777d4e83c 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -330,7 +330,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 09adfb591e6..414d2345503 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -381,7 +381,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 90f81bbe130..1e674f102e1 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -218,7 +218,7 @@ CONFIG_ARCH_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index a80394dc5f1..9d9a25b4732 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -221,7 +221,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 12c8b37fdcb..77b319aa8cf 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -284,7 +284,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 216453c3d90..deb3e2be347 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -241,7 +241,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 1707a7c273c..2b768bd0c4a 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -274,7 +274,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index 23e5ef5e016..10e876fb271 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -200,7 +200,7 @@ CONFIG_ARCH_BOARD="p112"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index bdd78202621..a1ad66b60b2 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -294,7 +294,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index a647d472991..3ab55c46432 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -262,7 +262,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index 2fe0e546881..d4a20b5ec98 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -321,7 +321,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig
index 077362ac3c6..c0f93839cdc 100644
--- a/configs/pic32-starterkit/nsh2/defconfig
+++ b/configs/pic32-starterkit/nsh2/defconfig
@@ -330,7 +330,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 3ae17449a63..308ede122c3 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -336,7 +336,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index bc4d31edf43..acdadc2da92 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -180,7 +180,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index f508af256eb..53eb77ec94a 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -142,7 +142,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/px4fmu-v2_upstream/nsh/defconfig b/configs/px4fmu-v2_upstream/nsh/defconfig
index 9343d3513a1..7b08d41638b 100644
--- a/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/configs/px4fmu-v2_upstream/nsh/defconfig
@@ -418,7 +418,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index f6c7d8f45d1..29a0af36f4a 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -152,7 +152,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index a2282f78b8a..39e79498d09 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -151,7 +151,7 @@ CONFIG_ARCH_BOARD="qemu-i486"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index 548fb648cd4..527e48b5e37 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -136,7 +136,7 @@ CONFIG_ARCH_BOARD="rgmp"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index b6c6d30443e..f220399da45 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -157,7 +157,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 71a4284c5a8..f6b08e92f65 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -164,7 +164,7 @@ CONFIG_ARCH_BOARD="rgmp"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 60c5edec227..faa7c64d5f4 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -144,7 +144,7 @@ CONFIG_ARCH_BOARD="rgmp"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index ad45dbeb604..1feb05a4d7d 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -164,7 +164,7 @@ CONFIG_ARCH_BOARD="rgmp"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index 729c97c5c5d..02297f5516c 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -165,7 +165,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=1
+CONFIG_USEC_PER_TICK=1000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index b681d09a91d..542ae767701 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -289,7 +289,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index c6cb8509d7f..cce7bab5cd9 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -282,7 +282,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 7525bf8c23f..80a9bab4adc 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -281,7 +281,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 18d6b9fddba..c6ceba2b981 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -285,7 +285,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index b232ddc1ed0..8107b6c4e72 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -338,7 +338,7 @@ CONFIG_SAM4EEK_AT25_FTL=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 83d2a40932a..dad34d1cb52 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -343,7 +343,7 @@ CONFIG_SAM4EEK_AT25_FTL=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index fc955a3d964..0388b6b6915 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -305,7 +305,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index b8e7bfeb730..37a027964e6 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -335,7 +335,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_SYSTEMTICK_EXTCLK=y
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 052e798306f..39449c9b747 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -284,7 +284,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 2927a45a948..443f6a36a32 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -319,7 +319,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index cb2b61b6ce0..7c4e8e5ee21 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -376,7 +376,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index b6717f8d332..3a19a484804 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -300,7 +300,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index b75968ae92e..7566d31b00c 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -314,7 +314,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index a61b3ff830f..73b6657b6e4 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -322,7 +322,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index f1def5693b4..fd64b7c7475 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -359,7 +359,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index be017823e49..9a4682fb266 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -381,7 +381,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 86cab4175b4..63d329e1cbb 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -392,7 +392,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 60906f60f13..3b63df73346 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -365,7 +365,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 97d01cb46f1..bd4ed89ed90 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -339,7 +339,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index 66b6a8e0ba8..b1b16d76c04 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -337,7 +337,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 1ce6544a000..da666e27d14 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -439,7 +439,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index ae2f2d60b0d..dd65b2b1fae 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -439,7 +439,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 3db1a77529b..0769c9e625f 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -330,7 +330,7 @@ CONFIG_DISABLE_ENVIRON=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 2813633fce6..6993f9f54a2 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -258,7 +258,7 @@ CONFIG_SAMD20_XPLAINED_USART4_EXT3=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 59985071dee..759b02aa65e 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -253,7 +253,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 24eafa29eab..31d3a2c53a1 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -393,7 +393,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index a574cd1c747..9a0067d809a 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -240,7 +240,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 142ea9c166c..cbe17891d4f 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -153,7 +153,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 2672e1ac7f0..c0ff11bf466 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -153,7 +153,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 9b4662699b2..da11fa3c11a 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -153,7 +153,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index c5036f665d2..ab841a91b39 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -153,7 +153,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 09ccf384366..4911cac5751 100755
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -146,7 +146,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 8a8d1b00eaf..e2ee4e6fb53 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -146,7 +146,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 435653aaf66..91fe81100a3 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -141,7 +141,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index dd4250e92f1..c320668e1fd 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -158,7 +158,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 0cc3ab799d1..ee727df1be8 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -159,7 +159,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index a833eed4074..d14598ed807 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -134,7 +134,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 64828d3e751..d7aaf084196 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -145,7 +145,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index eafc479c8dd..d13da3e7575 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -141,7 +141,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index fdcc4658983..51ac6cd5884 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -153,7 +153,7 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index c32a9692039..3dbeea5ebaf 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -145,7 +145,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 2b55275d160..223c545fd1e 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -163,7 +163,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR=0x007b68ee
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index e7cd32cdfbd..69950f0975f 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -139,7 +139,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 7e89c6877dc..37649e0793a 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -362,7 +362,7 @@ CONFIG_SPARK_FLASH_MINOR=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index d0bdb8c3a3c..f18bf6b06ae 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -362,7 +362,7 @@ CONFIG_SPARK_FLASH_MINOR=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 944a4a12035..a202f949526 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -362,7 +362,7 @@ CONFIG_SPARK_FLASH_MINOR=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 68a2f3fc12d..7a813444585 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -361,7 +361,7 @@ CONFIG_SPARK_FLASH_MINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index cf021438be6..2634d58c1e5 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -361,7 +361,7 @@ CONFIG_SPARK_FLASH_MINOR=0
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 901b34438e5..eca59421709 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -364,7 +364,7 @@ CONFIG_ARCH_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index e9ba6c79caf..dc8eb9e699c 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -372,7 +372,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index f879621dc70..5dcf5ad6d74 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -375,7 +375,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index ef6d9e88b08..56a55ec52eb 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -390,7 +390,7 @@ CONFIG_STM3210E_R61580_DISABLE=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index e5193dad219..b95bb12f0fb 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -380,7 +380,7 @@ CONFIG_STM3210E_R61580_DISABLE=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index ff947f96258..982c27cf284 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -370,7 +370,7 @@ CONFIG_STM3210E_R61580_DISABLE=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index a3b02be5cc9..9404d573ee5 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -387,7 +387,7 @@ CONFIG_PM_BUTTON_ACTIVITY=10
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index aa4cb26a8ea..958d9aadb95 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -365,7 +365,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 598e7f3c1e8..c89f15cb03f 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -356,7 +356,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index a58a11c9541..3d9b4a2b7cf 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -391,7 +391,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 822c11f2769..ce92a4e32b4 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -391,7 +391,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 4ef7143ef2f..aa1f0ebbc16 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -395,7 +395,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index eea45f74fcb..e65c18fcf15 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -403,7 +403,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 1d52a7e1e06..cef46d0b35e 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -408,7 +408,7 @@ CONFIG_LCD_RDSHIFT=5
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 0294aa40bb4..4160786fc46 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -391,7 +391,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index 2d7e3c9d5a2..f736ebd7a90 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -393,7 +393,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index a681e0228af..11a46a2dbd5 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -421,7 +421,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 92506b2ddd2..8a8e270e7af 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -398,7 +398,7 @@ CONFIG_STM3240G_BOARDINIT_STACK=2048
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 60c139600d6..31b301ed522 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -393,7 +393,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index ccf3feba04e..dd231a9d82a 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -404,7 +404,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 743855c3f3b..8e6548d6519 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -405,7 +405,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 17c28b83e16..330368dbcea 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -409,7 +409,7 @@ CONFIG_STM3240G_LCD_RDSHIFT=5
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index a7632e18d4a..d271b8158c4 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -409,7 +409,7 @@ CONFIG_STM3240G_LCD_RDSHIFT=5
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index 3141d9d9886..f03c3cafccc 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -393,7 +393,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 7880c3f3e43..6dfd23ab79e 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -396,7 +396,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 0483a42afd9..931a1fb0aec 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -421,7 +421,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 6e768e4e463..d355c5d0840 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -306,7 +306,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index c425e91fc50..0ea2b96e299 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -270,7 +270,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 16a84628615..ea16e41c653 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -230,7 +230,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 47266438065..e97b7d4df61 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -324,7 +324,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index a6d9ea1f388..27a9a161f65 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -316,7 +316,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index 01c5b1f2dea..6fffcf6de96 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -417,7 +417,7 @@ CONFIG_STM32F429I_DISCO_RAMMTD_SIZE=256
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index c266e0d652e..bd9adf2c579 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -402,7 +402,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index a192adfb39c..1fa30cc00a4 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -415,7 +415,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 2b8cd967931..58b6ccaa3d3 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -412,7 +412,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index ef87885627b..044452a0356 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -375,7 +375,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index 58d81d0d9b1..14ca07060d0 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -375,7 +375,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 8f60d650067..c6335b1f93e 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -381,7 +381,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_BOARD_INITIALIZE=y
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 4cd358e2b34..b3ca47a2660 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -384,7 +384,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 21e5cba0cdd..01df5ed62c9 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -385,7 +385,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 8fafc0d0380..cbb2efeaa60 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -386,7 +386,7 @@ CONFIG_PM_BUTTON_ACTIVITY=10
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 7af10213aa1..615f6383d37 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -375,7 +375,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 4850930222a..ccde0029275 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -384,7 +384,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 8cd3765452f..9f3b1067f8b 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -248,7 +248,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 4f9d0ccb521..8723a5c9573 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -308,7 +308,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index ff3e08395b5..31d534cefa8 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -232,7 +232,7 @@ CONFIG_NSH_DISABLEBG=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index ad808878ea5..8f6c7dcbc7b 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -296,7 +296,7 @@ CONFIG_ARCH_DBDP11215=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 00a11f83f40..3c04eb51f6d 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -297,7 +297,7 @@ CONFIG_ARCH_DBDP11215=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index ebab93ef423..582891e0e8f 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -166,7 +166,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index 320d8d6e6e7..432eec438ff 100644
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -167,7 +167,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig
index eff8ed2906d..c6464649a5a 100644
--- a/configs/teensy/usbmsc/defconfig
+++ b/configs/teensy/usbmsc/defconfig
@@ -165,7 +165,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 2cac6e0ef80..4e716c03488 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -236,7 +236,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index c90cebadcad..19bbb41b0eb 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -228,7 +228,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 208ea8587da..ec1033bf02d 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -322,7 +322,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index da3c982ff1c..e442982ce37 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -160,7 +160,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 3f5fb608fb0..434de283697 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -159,7 +159,7 @@ CONFIG_ARCH_BUTTONS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 2c170a6502d..5d087dc7e50 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -358,7 +358,7 @@ CONFIG_VIEWTOOL_TIM6_PERIOD=36000
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index d3ccd5e6aae..1df27b09159 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -429,7 +429,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 2113c424181..ccd20ec0d0f 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -406,7 +406,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 79deec5c5d7..b77a58a5c3e 100644
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -387,7 +387,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_CPULOAD is not set
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 262797c68fa..07ea7f2b9ee 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -120,7 +120,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index c28097a342a..8367db6b924 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -119,7 +119,7 @@ CONFIG_ARCH_BOARD="xtrs"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 88445242c53..b62be778e2a 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -120,7 +120,7 @@ CONFIG_ARCH_BOARD="xtrs"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 9127639fd34..42b49768f27 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -192,7 +192,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index e13799c3c87..64a3aab4a48 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -167,7 +167,7 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index eac9d5203db..e4205c8af24 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -143,7 +143,7 @@ CONFIG_ARCH_LEDS=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index f576bb7552e..404c5555217 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -120,7 +120,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index e8a005a39f4..58e8a0752a2 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -119,7 +119,7 @@ CONFIG_ARCH_BOARD="z80sim"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 7f5ca7d2015..10300460aaf 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -119,7 +119,7 @@ CONFIG_ARCH_BOARD="z80sim"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index ea4a3974cd6..29b9ec6ba6c 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -135,7 +135,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 6947517b856..3d1df01573b 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -135,7 +135,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 3257f417559..0f6b5b9a390 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_MQUEUE=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index b1bb9417148..f358a10b822 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index 1efc2d799a0..a7ca866efbe 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -285,7 +285,7 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 40370dba7f5..b46b1665a89 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -282,7 +282,7 @@ CONFIG_DISABLE_MQUEUE=y
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 78127228084..36e9e65d3e8 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -166,7 +166,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 5bbe4ae83e4..4b80da4f7d6 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -165,7 +165,7 @@ CONFIG_ARCH_BOARD="zp214xpa"
 #
 # RTOS Features
 #
-CONFIG_MSEC_PER_TICK=10
+CONFIG_USEC_PER_TICK=10000
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
diff --git a/include/limits.h b/include/limits.h
index 4d959d153f6..781901999f1 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,7 +1,7 @@
 /********************************************************************************
  * include/limits.h
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149,18 +149,19 @@
  *
  * _POSIX_TIMER_MAX is the per-process number of timers.
  *
- * _POSIX_CLOCKRES_MIN is the resolution of the CLOCK_REALTIME clock in nanoseconds.
- * CLOCK_REALTIME is controlled by the NuttX system time.  The default value is the
- * system timer which has a resolution of 10 milliseconds.  This default setting can
- * be overridden by defining the clock interval in milliseconds as CONFIG_MSEC_PER_TICK
- * in the board configuration file.
+ * _POSIX_CLOCKRES_MIN is the resolution of the CLOCK_REALTIME clock in
+ *    nanoseconds.  CLOCK_REALTIME is controlled by the NuttX system time.
+ *    The default value is the system timer which has a resolution of 1000
+ *    microseconds.  This default setting can be overridden by defining the
+ *    clock interval in microseconds as CONFIG_USEC_PER_TICK in the NuttX
+ *    configuration file.
  */
 
 #define _POSIX_DELAYTIMER_MAX 32
 #define _POSIX_TIMER_MAX      32
 
-#ifdef CONFIG_MSEC_PER_TICK
-# define _POSIX_CLOCKRES_MIN  ((CONFIG_MSEC_PER_TICK)*1000000)
+#ifdef CONFIG_USEC_PER_TICK
+# define _POSIX_CLOCKRES_MIN  ((CONFIG_USEC_PER_TICK)*1000)
 #else
 # define _POSIX_CLOCKRES_MIN  (10*1000000)
 #endif
diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h
index 21031060377..509d624d248 100644
--- a/include/nuttx/clock.h
+++ b/include/nuttx/clock.h
@@ -93,8 +93,8 @@
  * of milliseconds between calls from the processor-specific logic to
  * sched_process_timer().  The default value of MSEC_PER_TICK is 10
  * milliseconds (100KHz).  However, this default setting can be overridden
- * by defining the interval in milliseconds as CONFIG_MSEC_PER_TICK in the
- * board configuration file.
+ * by defining the interval in microseconds as CONFIG_USEC_PER_TICK in the
+ * NuttX configuration file.
  *
  * The following calculations are only accurate when (1) there is no
  * truncation involved and (2) the underlying system timer is an even
@@ -102,29 +102,44 @@
  * to redefine all of the following.
  */
 
-#ifdef CONFIG_MSEC_PER_TICK
-# define MSEC_PER_TICK        (CONFIG_MSEC_PER_TICK)
+#ifdef CONFIG_USEC_PER_TICK
+# define USEC_PER_TICK        (CONFIG_USEC_PER_TICK)
 #else
-# define MSEC_PER_TICK        (10)
+# define USEC_PER_TICK        (10000)
 #endif
 
-#define TICK_PER_DSEC         (MSEC_PER_DSEC / MSEC_PER_TICK)            /* Truncates! */
-#define TICK_PER_SEC          (MSEC_PER_SEC / MSEC_PER_TICK)             /* Truncates! */
-#define NSEC_PER_TICK         (MSEC_PER_TICK * NSEC_PER_MSEC)            /* Exact */
-#define USEC_PER_TICK         (MSEC_PER_TICK * USEC_PER_MSEC)            /* Exact */
+/* MSEC_PER_TICK can be very inaccurate if CONFIG_USEC_PER_TICK is not an
+ * even multiple of milliseconds.  Calculations using USEC_PER_TICK are
+ * preferred for that reason (at the risk of overflow)
+ */
+
+#define TICK_PER_DSEC         (USEC_PER_DSEC / USEC_PER_TICK)            /* Truncates! */
+#define TICK_PER_SEC          (USEC_PER_SEC / USEC_PER_TICK)             /* Truncates! */
+#define MSEC_PER_TICK         (USEC_PER_MSEC / USEC_PER_TICK)            /* Truncates! */
+#define NSEC_PER_TICK         (USEC_PER_TICK * NSEC_PER_USEC)            /* Exact */
 
 #define NSEC2TICK(nsec)       (((nsec)+(NSEC_PER_TICK/2))/NSEC_PER_TICK) /* Rounds */
 #define USEC2TICK(usec)       (((usec)+(USEC_PER_TICK/2))/USEC_PER_TICK) /* Rounds */
-#define MSEC2TICK(msec)       (((msec)+(MSEC_PER_TICK/2))/MSEC_PER_TICK) /* Rounds */
-#define DSEC2TICK(dsec)       MSEC2TICK((dsec)*MSEC_PER_DSEC)
+#define DSEC2TICK(dsec)       MSEC2TICK((dsec)*MSEC_PER_DSEC)            /* Exact */
 #define SEC2TICK(sec)         MSEC2TICK((sec)*MSEC_PER_SEC)              /* Exact */
 
+#if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK
+#  define MSEC2TICK(msec)     (((msec)+(MSEC_PER_TICK/2))/MSEC_PER_TICK) /* Rounds */
+#else
+#  define MSEC2TICK(msec)     USEC2TICK(msec * 1000)                     /* Rounds */
+#endif
+
 #define TICK2NSEC(tick)       ((tick)*NSEC_PER_TICK)                     /* Exact */
 #define TICK2USEC(tick)       ((tick)*USEC_PER_TICK)                     /* Exact */
-#define TICK2MSEC(tick)       ((tick)*MSEC_PER_TICK)                     /* Exact */
 #define TICK2DSEC(tick)       (((tick)+(TICK_PER_DSEC/2))/TICK_PER_DSEC) /* Rounds */
 #define TICK2SEC(tick)        (((tick)+(TICK_PER_SEC/2))/TICK_PER_SEC)   /* Rounds */
 
+#if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK
+#define TICK2USEC(tick)       ((tick)*MSEC_PER_TICK)                     /* Exact */
+#else
+#  define TICK2MSEC(tick)     (((tick)*USEC_PER_TICK)/USEC_PER_MSEC)     /* Rounds */
+#endif
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/include/time.h b/include/time.h
index 414e1999523..b0e6a0c2550 100644
--- a/include/time.h
+++ b/include/time.h
@@ -55,13 +55,13 @@
  * replaced with CLOCKS_PER_SEC.  Both are defined here.
  *
  * The default value is 100Hz, but this default setting can be overridden by
- * defining the clock interval in milliseconds as CONFIG_MSEC_PER_TICK in the
+ * defining the clock interval in microseconds as CONFIG_USEC_PER_TICK in the
  * board configuration file.
  */
 
-#ifdef CONFIG_MSEC_PER_TICK
-# define CLK_TCK           (1000/CONFIG_MSEC_PER_TICK)
-# define CLOCKS_PER_SEC    (1000/CONFIG_MSEC_PER_TICK)
+#ifdef CONFIG_USEC_PER_TICK
+# define CLK_TCK           (1000000/CONFIG_USEC_PER_TICK)
+# define CLOCKS_PER_SEC    (1000000/CONFIG_USEC_PER_TICK)
 #else
 # define CLK_TCK           (100)
 # define CLOCKS_PER_SEC    (100)
diff --git a/sched/Kconfig b/sched/Kconfig
index 07d1194da36..54cb698d739 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -65,21 +65,33 @@ config SCHED_TICKLESS
 		additional plaform specific interfaces that must be provided as
 		defined include/nuttx/arch.h
 
-config MSEC_PER_TICK
+config USEC_PER_TICK
 	int "Milliseconds per system timer tick"
-	default 10 if !SCHED_TICKLESS
-	default 1 if SCHED_TICKLESS
+	default 10000 if !SCHED_TICKLESS
+	default 100 if SCHED_TICKLESS
 	---help---
-		The default system timer is 100Hz or MSEC_PER_TICK=10.  This setting
-		may be defined to inform NuttX that the processor hardware is providing
-		system timer interrupts at some interrupt interval other than 10 msec.
+		In the "normal" configuration where system time is provided by a
+		periodic timer interrupt, the default system timer is expected to
+		run at 100Hz or USEC_PER_TICK=10000.  This setting must be defined
+		to inform of NuttX the interval that the the processor hardware is
+		providing system timer interrupts to the OS.
 
 		If SCHED_TICKLESS is selected, then there are no system timer
-		interrupts.  In this case, MSEC_PER_TICK does not control any timer
+		interrupts.  In this case, USEC_PER_TICK does not control any timer
 		rates.  Rather, it only determines the resolution of time reported
 		by clock_systimer() and the resolution of times that can be set for
-		certain delays including watchdog timers and delayed work.  In these
-		cases it is better to have the MSEC_PER_TICK as low as possible.
+		certain delays including watchdog timers and delayed work.  In this
+		case there is a tradeoff:  It is better to have the USEC_PER_TICK as
+		low as possible for higher timing resolution.  However, the the time
+		is currently held in 'unsigned int' on some systems, this may be
+		16-bits but on most contemporary systems it will be 32-bits.  In
+		either case, smaller values of USEC_PER_TICK will reduce the range
+		of values that delays that can be represented.  So the tradeoff is
+		between range and resolution (you could also modify the code to use
+		a 64-bit value if you really want both).
+
+		The default, 100 microseconds, will provide for a range of delays
+		up to 120 hours.
 
 if !SCHED_TICKLESS
 
@@ -101,7 +113,7 @@ config SYSTEM_TIME64
 	default n
 	---help---
 		The system timer is incremented at the rate determined by
-		MSEC_PER_TICK, typically at 100Hz. The count at any given time is
+		USEC_PER_TICK, typically at 100Hz. The count at any given time is
 		then the "uptime" in units of system timer ticks.  By default, the
 		system time is 32-bits wide.  Those defaults provide a range of about
 		13.6 years which is probably a sufficient range for "uptime".