diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index b73fd77c38..886ae053c9 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
-      <p>Last Updated: March 6, 2014</p>
+      <p>Last Updated: August 7, 2014</p>
     </td>
   </tr>
 </table>
@@ -2564,7 +2564,7 @@ nsh>
   </tr>
   <tr>
     <td><b><code>date</code></b></td>
-    <td>!<code>CONFIG_DISABLE_CLOCK</code> &amp;&amp; <code>CONFIG_RTC</code></td>
+    <td><code>CONFIG_RTC</code></td>
     <td><code>CONFIG_NSH_DISABLE_DATE</code></td>
   </tr>
   <tr>
@@ -2700,8 +2700,7 @@ nsh>
   <tr>
     <td><b><code>ping</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_ICMP</code> &amp;&amp;
-        <code>CONFIG_NET_ICMP_PING</code>  &amp;&amp; !<code>CONFIG_DISABLE_CLOCK</code> &amp;&amp;
-        !<code>CONFIG_DISABLE_SIGNALS</code></td>
+        <code>CONFIG_NET_ICMP_PING</code> &amp;&amp; !<code>CONFIG_DISABLE_SIGNALS</code></td>
     <td><code>CONFIG_NSH_DISABLE_PING</code></td>
   </tr>
   <tr>
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index 71e9b4c260..10a609d290 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -183,7 +183,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 38ebbc6cc5..6cfcbd223f 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -178,7 +178,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="hello_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index c30dc1e1f1..9b6c51f276 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -271,7 +271,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 27c47214de..91225516ee 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -208,7 +208,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index ea0aaf7f0d..48a6ba489a 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -207,7 +207,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 94c1f9cfde..fa2e622048 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -231,7 +231,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 173191ed57..08384dc4bf 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -230,7 +230,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index de85c10562..34d236c40d 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -232,7 +232,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index f44695b67a..6ed416c9b8 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -278,7 +278,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index f2d33965ae..9d33cd37cf 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -212,7 +212,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 2420b0aaef..b74e6bfada 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -228,7 +228,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index ee2d26bc79..31bacebac9 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -232,7 +232,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index 0a31a7dd04..e1a2a4ec55 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -232,7 +232,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 383a74b422..f322634769 100644
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -187,7 +187,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/ea3131/locked/mklocked.sh b/configs/ea3131/locked/mklocked.sh
index ff648d7b73..c8c3f9a769 100755
--- a/configs/ea3131/locked/mklocked.sh
+++ b/configs/ea3131/locked/mklocked.sh
@@ -2,7 +2,7 @@
 ###########################################################################
 # configs/ea3131/locked/mklocked.sh
 #
-#   Copyright (C) 2010-2013 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
@@ -159,11 +159,7 @@ echo "EXTERN(up_allocate_heap)" >>ld-locked.inc
 echo "EXTERN(mm_initialize)" >>ld-locked.inc
 echo "EXTERN(irq_initialize)" >>ld-locked.inc
 echo "EXTERN(wd_initialize)" >>ld-locked.inc
-
-answer=$(checkconfig CONFIG_DISABLE_CLOCK)
-if [ $answer = n ]; then
-	echo "EXTERN(clock_initialize)" >>ld-locked.inc
-fi
+echo "EXTERN(clock_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_DISABLE_POSIX_TIMERS)
 if [ $answer = n ]; then
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index c30869686f..22e69dfcf6 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -230,7 +230,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 8c94553b7c..fb5e0010b9 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -271,7 +271,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index bedafe56b5..e2d3dd56bd 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -253,7 +253,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 0c95620542..d9154ec943 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -246,7 +246,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 10094fc495..8b3a209cb3 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -269,7 +269,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index f3ed84aea1..d723dc7865 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -295,7 +295,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 4870217275..bc93ed62c2 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -275,7 +275,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 77b40871da..10c2aaa5ad 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -257,7 +257,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxflat_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 4d04c7fdc0..4d03586823 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -262,7 +262,6 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index fa198e0434..0b32ad2e6d 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -261,7 +261,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 92eb27f394..cc866ddd4b 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -228,7 +228,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index fccc645db9..98f4e96865 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -256,7 +256,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="dhcpd_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 351d0b918a..48aef09aad 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -257,7 +257,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index fa612f03f6..65553e2f84 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -256,7 +256,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index b6951c8493..deec47ea3c 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -258,7 +258,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index b0728d6e34..9aa80091f6 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -257,7 +257,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="poll_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 61b43aaf8f..2bcb9bf1fa 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -272,7 +272,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 09921f5008..24e859bc3b 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -231,7 +231,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index c5ec9229c0..b8ca2777c3 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -236,7 +236,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 79d31483f9..41d8bdeeeb 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -291,7 +291,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="buttons_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 337ca5495f..3329a5ac30 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -302,7 +302,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index b109b18283..c8ca2b6790 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -316,7 +316,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index eb9de78496..4b3c6d1599 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -381,7 +381,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index 025b2b171e..c4866289ec 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -292,7 +292,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index d28374d761..7e9f1dbbd4 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -372,7 +372,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 66c9dae6be..39ff29145f 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -247,7 +247,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index c4e6f7c348..f54880b8d0 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -281,7 +281,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 48d294dfae..634fa10df8 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -258,7 +258,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index af74676c45..0baec5b8b3 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -267,7 +267,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index af74676c45..0baec5b8b3 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -267,7 +267,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 51a1793786..ecfe5f4f6e 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -249,7 +249,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 2606115f43..4f7789e622 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -275,7 +275,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index ca5db5fff9..45febb5a6d 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -257,7 +257,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 1049b203e9..340295bd38 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -259,7 +259,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index b635bba360..3079a80f22 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -287,7 +287,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 61cd809310..e7e14f1e5b 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -272,7 +272,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 064b66c063..b03d2f9e30 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -274,7 +274,6 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 48bb6b3a95..a9176137e2 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -261,7 +261,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 40ec7d9625..18ef5421ee 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -272,7 +272,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 661fad530a..5b17b45f44 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -272,7 +272,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 04d65ae81d..30d281834c 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -292,7 +292,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="hidkbd_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 1d9e0c8bc2..1727ac9e51 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -282,7 +282,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 1b41fa789e..737ec65c6b 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -239,7 +239,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="conn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index d8f028aeff..88d14c2411 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -194,7 +194,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 0f7860829d..49b1141d01 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -238,7 +238,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index fa355167b7..8c20ea6f45 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -239,7 +239,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index f727328994..eb82914b83 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -186,7 +186,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="hello_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 2826d98fcb..5e81ecd1f5 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -436,7 +436,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=4
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 0e66e3e53f..39e660408b 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -410,7 +410,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=4
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 4f9916a541..d8d0b79065 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -379,7 +379,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 439d843b96..3125028769 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -379,7 +379,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 53d51d7e4d..ba73f2bef4 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -379,7 +379,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxtext_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 6867e1fb9d..168e94fe91 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -402,7 +402,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 4f843c8c42..8800630e7f 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -342,7 +342,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index fea5b1f4f9..43c8c03b8b 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -343,7 +343,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 9dd6cb73c2..7ca9f08c50 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -208,7 +208,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index d9df2a2eb4..ab58c80bf4 100644
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -187,7 +187,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index cb5771d0a1..3c81781c02 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -216,7 +216,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 03b07cf22f..be2ce7adb7 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -218,7 +218,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 98b6d4b26c..a8c70280a1 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -216,7 +216,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="poll_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 715c8b216b..c3b3c6c23a 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -216,7 +216,6 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index e7f085f90b..1f6ff379c9 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -216,7 +216,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="udp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index 0561d080c0..c6a7ce2453 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -216,7 +216,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig
index 229a6f1b10..6d679dec04 100644
--- a/configs/nucleo-f401re/nsh/defconfig
+++ b/configs/nucleo-f401re/nsh/defconfig
@@ -389,7 +389,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 8c67481d78..b9dc30d80e 100644
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -290,7 +290,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig
index fca58cfc8a..9532979953 100644
--- a/configs/nucleus2g/usbmsc/defconfig
+++ b/configs/nucleus2g/usbmsc/defconfig
@@ -280,7 +280,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 81068bece5..b74c5b6905 100644
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -259,7 +259,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index ba18b9328f..1e3d45607a 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -253,7 +253,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 81733bf7a2..896355a85e 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -229,7 +229,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index d6f336a8dd..965ea8d460 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -275,7 +275,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index e3d1d7ec33..99ac5877e5 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -282,7 +282,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 8f0a314825..0b60ed0603 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -284,7 +284,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 1eced1361c..7c70a3c5d0 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 3114d067f2..ab6ea6026e 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -276,7 +276,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index ea08b2f8bf..d08960b7d3 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -270,7 +270,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 89d388e385..69967e5f2d 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -264,7 +264,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index 338992ca47..ca0fafaa92 100644
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 91f90240fa..3f6ab42de4 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index caf4793a1d..f459109a90 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index b4b5031785..5f754f5118 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -277,7 +277,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 4ee62ac3a5..f964b70ad4 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -222,7 +222,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-stm32-h405/nshusb/defconfig b/configs/olimex-stm32-h405/nshusb/defconfig
index b10f73b113..96956cb7f2 100644
--- a/configs/olimex-stm32-h405/nshusb/defconfig
+++ b/configs/olimex-stm32-h405/nshusb/defconfig
@@ -389,7 +389,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index d64bb62ff5..76931fd4f3 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -351,7 +351,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 94065f50ce..09adfb591e 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -402,7 +402,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index b66edee053..90f81bbe13 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -241,7 +241,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 521e8c3036..a80394dc5f 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -244,7 +244,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 19d16ee3c4..12c8b37fdc 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -305,7 +305,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 29a9c7c824..216453c3d9 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -262,7 +262,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index d7cea2ce3c..1707a7c273 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -295,7 +295,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index f990259c35..23e5ef5e01 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -220,7 +220,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 14b5303951..bdd7820262 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -315,7 +315,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 86d278c6ca..a647d47299 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -284,7 +284,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index 9f155f3ab4..2fe0e54688 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -344,7 +344,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig
index 1de58362f0..077362ac3c 100644
--- a/configs/pic32-starterkit/nsh2/defconfig
+++ b/configs/pic32-starterkit/nsh2/defconfig
@@ -353,7 +353,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 029085dec8..3ae17449a6 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -359,7 +359,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index acc1a590cc..bc4d31edf4 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -201,7 +201,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 6480973ad0..f508af256e 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -165,7 +165,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 8deea6625b..f6c7d8f45d 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -175,7 +175,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index f09c285f2c..a2282f78b8 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -174,7 +174,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index 3272bf6dc6..548fb648cd 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -159,7 +159,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="rgmp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index 5be13a7cd7..b6c6d30443 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -180,7 +180,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index eaef71993f..71a4284c5a 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -187,7 +187,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="cxxtest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 49b671b68d..60c5edec22 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -167,7 +167,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="rgmp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index 6e955a214e..ad45dbeb60 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -187,7 +187,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="helloxx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index ec63e9e74f..729c97c5c5 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -188,7 +188,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index b5cbdf2824..b681d09a91 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -312,7 +312,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index c637b1825b..c6cb8509d7 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -305,7 +305,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 8ccc5cdb8e..7525bf8c23 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -304,7 +304,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 4cf822037f..18d6b9fddb 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -309,7 +309,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 69c54dac59..b232ddc1ed 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -361,7 +361,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 935dacfae6..83d2a40932 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -366,7 +366,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 7ae036f74d..fc955a3d96 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -328,7 +328,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 74ea38bc80..b8e7bfeb73 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -326,7 +326,6 @@ CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH="/dev/tc0"
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index cd4c790ead..052e798306 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -307,7 +307,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 55a7f98e42..2927a45a94 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -310,7 +310,6 @@ CONFIG_SAMA5D3XPLAINED_396MHZ=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index a0ca86aef9..cb2b61b6ce 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -367,7 +367,6 @@ CONFIG_SAMA5D3xEK_AT25_FTL=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index f4a1c5df3a..b6717f8d33 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -291,7 +291,6 @@ CONFIG_SAMA5D3xEK_396MHZ=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index bdfc03f5bf..b75968ae92 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -305,7 +305,6 @@ CONFIG_SAMA5D3xEK_NOR_MAIN=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index b05657abb2..a61b3ff830 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -313,7 +313,6 @@ CONFIG_SAMA5D3xEK_396MHZ=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 226435765f..f1def5693b 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -350,7 +350,6 @@ CONFIG_SAMA5D3xEK_MT47H128M16RT=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 3045e348a3..be017823e4 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -372,7 +372,6 @@ CONFIG_SAMA5D3xEK_WM8904_SRCMAIN=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index d3d02bf0d7..86cab4175b 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -383,7 +383,6 @@ CONFIG_SAMA5D3xEK_TSD_DEVMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index d1fb811180..60906f60f1 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -356,7 +356,6 @@ CONFIG_SAMA5D3xEK_OV2640_DEMO=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 4f923e7f44..97d01cb46f 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -330,7 +330,6 @@ CONFIG_SAMA5D4EK_AT25_CHARDEV=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index bbd016d574..66b6a8e0ba 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -328,7 +328,6 @@ CONFIG_SAMA5D4EK_DRAM_MAIN=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index aa33fc1ca5..1ce6544a00 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -430,7 +430,6 @@ CONFIG_SAMA5D4EK_MXT_DEVMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 8fa1341b87..ae2f2d60b0 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -430,7 +430,6 @@ CONFIG_SAMA5D4EK_MXT_DEVMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 663b9257c7..3db1a77529 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -321,7 +321,6 @@ CONFIG_SAMA5D4EK_MT47H128M16RT=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 227b359de2..2813633fce 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -281,7 +281,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 05dcf083f5..59985071de 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -278,7 +278,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 33e80895ef..24eafa29ea 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -416,7 +416,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index a5f7437ef4..a574cd1c74 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -265,7 +265,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 199e6c5dce..142ea9c166 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -176,7 +176,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="configdata_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 8e1770181f..2672e1ac7f 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -177,7 +177,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=4
 CONFIG_USER_ENTRYPOINT="cxxtest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 8818650a73..9b4662699b 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -176,7 +176,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="mount_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index d459658889..c5036f665d 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -176,7 +176,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="mtdpart_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 1534fd11e5..09ccf38436 100755
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -137,7 +137,6 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index fe0caef686..8a8d1b00ea 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -137,7 +137,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 0be30d738e..435653aaf6 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -164,7 +164,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 027cafc0e4..dd4250e92f 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -181,7 +181,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index d254a6879f..0cc3ab799d 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -182,7 +182,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 696804dc76..a833eed407 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -157,7 +157,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxffs_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 64bd0c8e53..64828d3e75 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -169,7 +169,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 437f1464e0..eafc479c8d 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -165,7 +165,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 721489808c..fdcc465898 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -177,7 +177,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 211b798e8d..c32a969203 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -136,7 +136,6 @@ CONFIG_ARCH_BOARD="sim"
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 0a598373df..2b55275d16 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -186,7 +186,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="tc_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 43e6e6ee1d..e7cd32cdfb 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -162,7 +162,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index 3a95f4867d..cf021438be 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -384,7 +384,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 058bacb490..901b34438e 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -387,7 +387,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="buttons_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 69d2c9267b..e9ba6c79ca 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -395,7 +395,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="conn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index d615637cc0..f879621dc7 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -398,7 +398,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 361c34e7d2..ef6d9e88b0 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -413,7 +413,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 25e77c6104..e5193dad21 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -403,7 +403,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index c506799e6f..ff947f9625 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -393,7 +393,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 5ab88d602c..a3b02be5cc 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -410,7 +410,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 61272fa295..aa4cb26a8e 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -388,7 +388,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 1a536b6bf7..598e7f3c1e 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -379,7 +379,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="usbserial_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index d252bd1d7a..a58a11c954 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -414,7 +414,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="dhcpd_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 5ffe0add62..822c11f276 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -414,7 +414,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index ea16fd6b1e..4ef7143ef2 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -418,7 +418,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 45663526cc..eea45f74fc 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -426,7 +426,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index a52ccd89ba..1d52a7e1e0 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -432,7 +432,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 310a83d554..0294aa40bb 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -414,7 +414,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="shell_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index a5d77338b7..2d7e3c9d5a 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -416,7 +416,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="dhcpd_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 821892df74..a681e0228a 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -444,7 +444,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="discover_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 340d32692c..92506b2ddd 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -422,7 +422,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 5266e615ec..60c139600d 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -416,7 +416,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nettest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 65fcc8c5f8..ccf3feba04 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -427,7 +427,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 46e17f4b1d..743855c3f3 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -428,7 +428,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 22cc4a9cd7..17c28b83e1 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -432,7 +432,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 119448ec37..a7632e18d4 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -433,7 +433,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index 4fdd3e2bdb..3141d9d988 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -416,7 +416,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="shell_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 5d518736dc..7880c3f3e4 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -419,7 +419,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 5b04bae761..16a8462861 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -255,7 +255,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 311bd25187..4726643806 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -345,7 +345,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 190be82b87..a6d9ea1f38 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -337,7 +337,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index b5ad2dfd01..01c5b1f2de 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -440,7 +440,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 7ab2d4f159..c266e0d652 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -425,7 +425,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index bfa37b7391..a192adfb39 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -438,7 +438,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index a10db01747..2b8cd96793 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -435,7 +435,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 63a5da1929..ef87885627 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -399,7 +399,6 @@ CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=4
 CONFIG_USER_ENTRYPOINT="cxxtest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index b9e803fa36..58d81d0d9b 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -398,7 +398,6 @@ CONFIG_SCHED_STARTHOOK=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="elf_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 28385e3f90..8f60d65006 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -404,7 +404,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 3bf9bf1dd9..4cd358e2b3 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -407,7 +407,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 1be726ab78..21e5cba0cd 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -408,7 +408,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 00a4732652..8fafc0d038 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -409,7 +409,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 00f192a5a0..7af10213aa 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -398,7 +398,6 @@ CONFIG_SCHED_STARTHOOK=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="spawn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 03c7a0653c..4850930222 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -407,7 +407,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index f83e38ccd3..8cd3765452 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -268,7 +268,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index dbfcb4a34d..4f9d0ccb52 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -329,7 +329,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 1047d374f7..ff3e08395b 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -257,7 +257,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 55bfadc8cb..ad808878ea 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -317,7 +317,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index c9030c54ec..00a11f83f4 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -318,7 +318,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index 18dac223f4..ebab93ef42 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -189,7 +189,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="hello_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index 9137ea0d44..320d8d6e6e 100644
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -190,7 +190,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig
index 216f575879..eff8ed2906 100644
--- a/configs/teensy/usbmsc/defconfig
+++ b/configs/teensy/usbmsc/defconfig
@@ -188,7 +188,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 70dcefccd4..2cac6e0ef8 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -259,7 +259,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 4c1e18e6d5..c90cebadca 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -249,7 +249,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 8665d266b2..208ea8587d 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -345,7 +345,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index 35d49da682..da3c982ff1 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -183,7 +183,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 4382691556..3f5fb608fb 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -182,7 +182,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 8a7733394a..2c170a6502 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -381,7 +381,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="highpri_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 27e4ae252f..d3ccd5e6aa 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -420,7 +420,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 9b9ae68508..2113c42418 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -397,7 +397,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 730ea5b683..79deec5c5d 100644
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -412,7 +412,6 @@ CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 82eb529448..262797c68f 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -140,7 +140,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 187f826474..c28097a342 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -139,7 +139,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index a1b788b4c0..88445242c5 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -140,7 +140,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="pashello_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 85ad67ae7b..9127639fd3 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -183,7 +183,6 @@ CONFIG_NSH_MMCSDMINOR=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 52928e62ff..e13799c3c8 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -189,7 +189,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 1d9ae2e981..eac9d5203d 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -163,7 +163,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="pashello_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 6e1152cbc2..f576bb7552 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -140,7 +140,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 5e36aa939f..e8a005a39f 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -139,7 +139,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index eae963ed61..7f5ca7d201 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -139,7 +139,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="pashello_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 12a93707f0..ea4a3974cd 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -155,7 +155,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 5bc7a99d11..6947517b85 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -155,7 +155,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 496383dd61..3257f41755 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 440b1818fc..b1bb941714 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -276,7 +276,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index 0c9369c192..1efc2d799a 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -276,7 +276,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 8d069917d0..40370dba7f 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -273,7 +273,6 @@ CONFIG_ARCH_LEDS=y
 # RTOS Features
 #
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 37179491b6..7812722808 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -186,7 +186,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index d024b03047..5bbe4ae83e 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -185,7 +185,6 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h
index ed460d1d2e..2103106037 100644
--- a/include/nuttx/clock.h
+++ b/include/nuttx/clock.h
@@ -142,8 +142,6 @@ struct cpuload_s
  * Public Data
  ****************************************************************************/
 
-#if !defined(CONFIG_DISABLE_CLOCK)
-
 /* Access to raw system clock ***********************************************/
 /* Direct access to the system timer/counter is supported only if (1) the
  * system timer counter is available (i.e., we are not configured to use
@@ -288,5 +286,4 @@ int clock_cpuload(int pid, FAR struct cpuload_s *cpuload);
 }
 #endif
 
-#endif /* !CONFIG_DISABLE_CLOCK */
 #endif /* _INCLUDE_NUTTX_CLOCK_H */
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index e3cbc73bce..eab830caec 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -96,13 +96,11 @@ struct socket
 
 #ifdef CONFIG_NET_SOCKOPTS
   sockopt_t     s_options;   /* Selected socket options */
-#ifndef CONFIG_DISABLE_CLOCK
   socktimeo_t   s_rcvtimeo;  /* Receive timeout value (in deciseconds) */
   socktimeo_t   s_sndtimeo;  /* Send timeout value (in deciseconds) */
 #ifdef CONFIG_NET_SOLINGER
   socktimeo_t   s_linger;    /* Linger timeout value (in deciseconds) */
 #endif
-#endif
 #endif
 
   FAR void     *s_conn;      /* Connection: struct tcp_conn_s or udp_conn_s */
diff --git a/include/nuttx/net/netconfig.h b/include/nuttx/net/netconfig.h
index 5f4164a270..08bbfc08a8 100644
--- a/include/nuttx/net/netconfig.h
+++ b/include/nuttx/net/netconfig.h
@@ -132,7 +132,7 @@
 
 /* ICMP configuration options */
 
-#if !defined(CONFIG_NET_ICMP) || defined(CONFIG_DISABLE_CLOCK)
+#ifndef CONFIG_NET_ICMP
 #  undef CONFIG_NET_ICMP_PING
 #endif
 
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index 142c583acb..b7e76f032e 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -2,7 +2,7 @@
  * include/sys/syscall.h
  * This file contains the system call numbers.
  *
- *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -173,16 +173,12 @@
  * NuttX configuration.
  */
 
-#ifndef CONFIG_DISABLE_CLOCK
-#  define SYS_clock_systimer           (__SYS_clock+0)
-#  define SYS_clock_getres             (__SYS_clock+1)
-#  define SYS_clock_gettime            (__SYS_clock+2)
-#  define SYS_clock_settime            (__SYS_clock+3)
-#  define SYS_gettimeofday             (__SYS_clock+4)
-#  define __SYS_timers                 (__SYS_clock+5)
-#else
-#  define __SYS_timers                 __SYS_clock
-#endif
+#define SYS_clock_systimer             (__SYS_clock+0)
+#define SYS_clock_getres               (__SYS_clock+1)
+#define SYS_clock_gettime              (__SYS_clock+2)
+#define SYS_clock_settime              (__SYS_clock+3)
+#define SYS_gettimeofday               (__SYS_clock+4)
+#define __SYS_timers                   (__SYS_clock+5)
 
 /* The following are defined only if POSIX timers are supported */
 
diff --git a/libc/time/lib_time.c b/libc/time/lib_time.c
index 6335d354f5..8e596ef178 100644
--- a/libc/time/lib_time.c
+++ b/libc/time/lib_time.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libc/time/lib_time.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,8 +42,6 @@
 #include <sys/time.h>
 #include <time.h>
 
-#ifndef CONFIG_DISABLE_CLOCK
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -106,5 +104,3 @@ time_t time(time_t *tloc)
 
   return (time_t)ERROR;
 }
-
-#endif /* !CONFIG_DISABLE_CLOCK */
diff --git a/net/icmp/Make.defs b/net/icmp/Make.defs
index 805585e470..4bbe3f3911 100644
--- a/net/icmp/Make.defs
+++ b/net/icmp/Make.defs
@@ -40,15 +40,11 @@ ifeq ($(CONFIG_NET_ICMP),y)
 NET_CSRCS += icmp_input.c
 
 ifeq ($(CONFIG_NET_ICMP_PING),y)
-ifneq ($(CONFIG_DISABLE_CLOCK),y)
-
 NET_CSRCS += icmp_ping.c icmp_poll.c icmp_send.c
-
-endif
-endif
 endif
 
 # Include ICMP build support
 
 DEPPATH += --dep-path icmp
 VPATH += :icmp
+endif
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index bc615a06b8..53838b47ec 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #if defined(CONFIG_NET) && defined(CONFIG_NET_ICMP) && \
-    defined(CONFIG_NET_ICMP_PING) && !defined(CONFIG_DISABLE_CLOCK)
+    defined(CONFIG_NET_ICMP_PING)
 
 #include <sys/types.h>
 #include <stdint.h>
diff --git a/net/route/net_delroute.c b/net/route/net_delroute.c
index 9e3d271bdd..a585a4dc18 100644
--- a/net/route/net_delroute.c
+++ b/net/route/net_delroute.c
@@ -149,4 +149,4 @@ int net_delroute(net_ipaddr_t target, net_ipaddr_t netmask)
   return net_foreachroute(net_match, &match) ? OK : -ENOENT;
 }
 
-#endif /* CONFIG_NET && CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET && CONFIG_NET_ROUTE  */
diff --git a/net/socket/Make.defs b/net/socket/Make.defs
index f70c2d64f2..8a6482f8f5 100644
--- a/net/socket/Make.defs
+++ b/net/socket/Make.defs
@@ -48,10 +48,7 @@ endif
 # Socket options
 
 ifeq ($(CONFIG_NET_SOCKOPTS),y)
-SOCK_CSRCS += setsockopt.c getsockopt.c
-ifneq ($(CONFIG_DISABLE_CLOCK),y)
-SOCK_CSRCS += net_timeo.c
-endif
+SOCK_CSRCS += setsockopt.c getsockopt.c net_timeo.c
 endif
 
 # Support for network access using streams
diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c
index c7e66ed8e8..83d9e6e721 100644
--- a/net/socket/getsockopt.c
+++ b/net/socket/getsockopt.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/getsockopt.c
  *
- *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,6 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
 
       case SO_RCVTIMEO:
       case SO_SNDTIMEO:
-#ifndef CONFIG_DISABLE_CLOCK
         {
           socktimeo_t timeo;
 
@@ -202,7 +201,6 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
           *value_len   = sizeof(struct timeval);
         }
         break;
-#endif
 
       /* The following are not yet implemented */
 
diff --git a/net/socket/net_clone.c b/net/socket/net_clone.c
index 05d67f7ac8..94a1436728 100644
--- a/net/socket/net_clone.c
+++ b/net/socket/net_clone.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/net_clone.c
  *
- *   Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,13 +79,11 @@ int net_clone(FAR struct socket *psock1, FAR struct socket *psock2)
   psock2->s_flags    = psock1->s_flags;     /* See _SF_* definitions */
 #ifdef CONFIG_NET_SOCKOPTS
   psock2->s_options  = psock1->s_options;   /* Selected socket options */
-#ifndef CONFIG_DISABLE_CLOCK
   psock2->s_rcvtimeo = psock1->s_rcvtimeo;  /* Receive timeout value (in deciseconds) */
   psock2->s_sndtimeo = psock1->s_sndtimeo;  /* Send timeout value (in deciseconds) */
 #ifdef CONFIG_NET_SOLINGER
   psock2->s_linger   = psock1->s_linger;    /* Linger timeout value (in deciseconds) */
 #endif
-#endif
 #endif
   psock2->s_conn     = psock1->s_conn;      /* UDP or TCP connection structure */
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
diff --git a/net/socket/net_close.c b/net/socket/net_close.c
index 6e1a4337f2..394cc6232a 100644
--- a/net/socket/net_close.c
+++ b/net/socket/net_close.c
@@ -81,10 +81,8 @@ struct tcp_close_s
   FAR struct socket       *cl_psock;  /* Reference to the TCP socket */
   sem_t                    cl_sem;    /* Signals disconnect completion */
   int                      cl_result; /* The result of the close */
-#ifndef CONFIG_DISABLE_CLOCK
   uint32_t                 cl_start;  /* Time close started (in ticks) */
 #endif
-#endif
 };
 #endif
 
@@ -109,8 +107,7 @@ struct tcp_close_s
  *
  ****************************************************************************/
 
-#if defined(CONFIG_NET_TCP) && defined(CONFIG_NET_SOLINGER) && \
-   !defined(CONFIG_DISABLE_CLOCK)
+#if defined(CONFIG_NET_TCP) && defined(CONFIG_NET_SOLINGER)
 static inline int close_timeout(FAR struct tcp_close_s *pstate)
 {
   FAR struct socket *psock = 0;
@@ -136,7 +133,7 @@ static inline int close_timeout(FAR struct tcp_close_s *pstate)
 
   return FALSE;
 }
-#endif /* CONFIG_NET_SOCKOPTS && CONFIG_NET_SOLINGER && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS && CONFIG_NET_SOLINGER */
 
 /****************************************************************************
  * Function: netclose_interrupt
@@ -206,7 +203,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
         }
     }
 
-#if defined(CONFIG_NET_SOLINGER) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOLINGER
   /* Check for a timeout. */
 
   else if (pstate && close_timeout(pstate))
@@ -218,7 +215,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
       goto end_wait;
     }
 
-#endif /* CONFIG_NET_SOLINGER && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOLINGER */
 
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
   /* Check if all outstanding bytes have been ACKed */
@@ -341,11 +338,9 @@ static inline int netclose_disconnect(FAR struct socket *psock)
           state.cl_result    = -EBUSY;
           sem_init(&state.cl_sem, 0, 0);
 
-#ifndef CONFIG_DISABLE_CLOCK
           /* Record the time that we started the wait (in ticks) */
 
           state.cl_start = clock_systimer();
-#endif
         }
       else
 #endif /* CONFIG_NET_SOLINGER */
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index 40e4f4bdbe..b87a0192f0 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -99,7 +99,7 @@ struct sendfile_s
   ssize_t            snd_sent;    /* The number of bytes sent */
   uint32_t           snd_isn;     /* Initial sequence number */
   uint32_t           snd_acked;   /* The number of bytes acked */
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
   uint32_t           snd_time;    /* Last send time for determining timeout */
 #endif
 };
@@ -125,7 +125,7 @@ struct sendfile_s
  *
  ****************************************************************************/
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
 static inline int sendfile_timeout(FAR struct sendfile_s *pstate)
 {
   FAR struct socket *psock = 0;
@@ -146,7 +146,7 @@ static inline int sendfile_timeout(FAR struct sendfile_s *pstate)
 
   return FALSE;
 }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
 
 static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
                               FAR void *pvpriv, uint16_t flags)
@@ -157,9 +157,9 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
 
   if ((flags & TCP_ACKDATA) != 0)
     {
+#ifdef CONFIG_NET_SOCKOPTS
       /* Update the timeout */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
       pstate->snd_time = clock_systimer();
 #endif
 
@@ -343,11 +343,11 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
         }
     }
 
+#ifdef CONFIG_NET_SOCKOPTS
   /* All data has been send and we are just waiting for ACK or re-transmit
    * indications to complete the send.  Check for a timeout.
    */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
   if (sendfile_timeout(pstate))
     {
       /* Yes.. report the timeout */
@@ -356,7 +356,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
 
   if (pstate->snd_sent >= pstate->snd_flen
       && pstate->snd_acked < pstate->snd_flen)
@@ -523,9 +523,9 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   conn->unacked          = 0;
 
+#ifdef CONFIG_NET_SOCKOPTS
   /* Set the initial time for calculating timeouts */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
   state.snd_time         = clock_systimer();
 #endif
 
diff --git a/net/socket/net_timeo.c b/net/socket/net_timeo.c
index 0621060927..7efbc272fb 100644
--- a/net/socket/net_timeo.c
+++ b/net/socket/net_timeo.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/net_timeo.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS)
 
 #include <stdint.h>
 #include <debug.h>
@@ -81,5 +81,5 @@ int net_timeo(uint32_t start_time, socktimeo_t timeo)
   return FALSE;
 }
 
-#endif /* CONFIG_NET && CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET && CONFIG_NET_SOCKOPTS */
 
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index aae60d45bc..aeffcba320 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -85,7 +85,7 @@
 struct recvfrom_s
 {
   FAR struct socket       *rf_sock;      /* The parent socket structure */
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
   uint32_t                 rf_starttime; /* rcv start time for determining timeout */
 #endif
   FAR struct devif_callback_s *rf_cb;    /* Reference to callback instance */
@@ -406,7 +406,7 @@ static inline void recvfrom_readahead(struct recvfrom_s *pstate)
  ****************************************************************************/
 
 #if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_TCP)
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
 static int recvfrom_timeout(struct recvfrom_s *pstate)
 {
   FAR struct socket *psock = 0;
@@ -459,7 +459,7 @@ static int recvfrom_timeout(struct recvfrom_s *pstate)
 
   return FALSE;
 }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
 #endif /* CONFIG_NET_UDP || CONFIG_NET_TCP */
 
 /****************************************************************************
@@ -681,11 +681,11 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
               sem_post(&pstate->rf_sem);
             }
 
+#ifdef CONFIG_NET_SOCKOPTS
             /* Reset the timeout.  We will want a short timeout to terminate
              * the TCP receive.
              */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
             pstate->rf_starttime = clock_systimer();
 #endif
         }
@@ -748,11 +748,11 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
           sem_post(&pstate->rf_sem);
         }
 
+#ifdef CONFIG_NET_SOCKOPTS
       /* No data has been received -- this is some other event... probably a
        * poll -- check for a timeout.
        */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
       else if (recvfrom_timeout(pstate))
         {
           /* Yes.. the timeout has elapsed... do not allow any further
@@ -786,7 +786,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
 
           sem_post(&pstate->rf_sem);
         }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
     }
 
   return flags;
@@ -900,11 +900,11 @@ static uint16_t recvfrom_udpinterrupt(struct net_driver_s *dev, void *pvconn,
           sem_post(&pstate->rf_sem);
         }
 
+#ifdef CONFIG_NET_SOCKOPTS
       /* No data has been received -- this is some other event... probably a
        * poll -- check for a timeout.
        */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
       else if (recvfrom_timeout(pstate))
         {
           /* Yes.. the timeout has elapsed... do not allow any further
@@ -927,7 +927,7 @@ static uint16_t recvfrom_udpinterrupt(struct net_driver_s *dev, void *pvconn,
 
           sem_post(&pstate->rf_sem);
         }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
     }
 
   return flags;
@@ -973,7 +973,7 @@ static void recvfrom_init(FAR struct socket *psock, FAR void *buf, size_t len,
   /* Set up the start time for the timeout */
 
   pstate->rf_sock      = psock;
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
   pstate->rf_starttime = clock_systimer();
 #endif
 }
diff --git a/net/socket/sendto.c b/net/socket/sendto.c
index c04c7557e6..2827bd3b08 100644
--- a/net/socket/sendto.c
+++ b/net/socket/sendto.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/sendto.c
  *
- *   Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@
  * and a system clock.
  */
 
-#if !defined(CONFIG_NET_SOCKOPTS) || defined(CONFIG_DISABLE_CLOCK)
+#ifndef CONFIG_NET_SOCKOPTS
 #  undef CONFIG_NET_SENDTO_TIMEOUT
 #endif
 
diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c
index 2c89ea3c49..50764fa86b 100644
--- a/net/socket/setsockopt.c
+++ b/net/socket/setsockopt.c
@@ -169,9 +169,6 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
         }
         break;
 
-      /* The following are valid only if the OS CLOCK feature is enabled */
-
-#ifndef CONFIG_DISABLE_CLOCK
       case SO_RCVTIMEO:
       case SO_SNDTIMEO:
         {
@@ -212,7 +209,6 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
             }
         }
         break;
-#endif
 
 #ifdef CONFIG_NET_SOLINGER
       case SO_LINGER:
@@ -242,16 +238,12 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
           if (setting->l_onoff)
             {
               _SO_SETOPT(psock->s_options, option);
-#ifndef CONFIG_DISABLE_CLOCK
               psock->s_linger = 10 * setting->l_linger;
-#endif
             }
           else
             {
               _SO_CLROPT(psock->s_options, option);
-#ifndef CONFIG_DISABLE_CLOCK
               psock->s_linger = 0;
-#endif
             }
 
           net_unlock(flags);
diff --git a/net/socket/socket.h b/net/socket/socket.h
index 73d738d3f8..314206b6fc 100644
--- a/net/socket/socket.h
+++ b/net/socket/socket.h
@@ -174,7 +174,7 @@ int psock_close(FAR struct socket *psock);
 
 /* sockopt support ***********************************************************/
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
 int net_timeo(uint32_t start_time, socktimeo_t timeo);
 #endif
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index aa5f87413c..66453773d7 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -90,7 +90,7 @@ struct send_s
   ssize_t                 snd_sent;    /* The number of bytes sent */
   uint32_t                snd_isn;     /* Initial sequence number */
   uint32_t                snd_acked;   /* The number of bytes acked */
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
   uint32_t                snd_time;    /* Last send time for determining timeout */
 #endif
 #if defined(CONFIG_NET_TCP_SPLIT)
@@ -119,8 +119,7 @@ struct send_s
  *
  ****************************************************************************/
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
-
+#ifdef CONFIG_NET_SOCKOPTS
 static inline int send_timeout(FAR struct send_s *pstate)
 {
   FAR struct socket *psock = 0;
@@ -141,7 +140,7 @@ static inline int send_timeout(FAR struct send_s *pstate)
 
   return FALSE;
 }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
 
 /****************************************************************************
  * Function: tcpsend_interrupt
@@ -181,7 +180,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     {
       /* Update the timeout */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
       pstate->snd_time = clock_systimer();
 #endif
 
@@ -406,11 +405,11 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
         }
     }
 
+#ifdef CONFIG_NET_SOCKOPTS
   /* All data has been sent and we are just waiting for ACK or re-transmit
    * indications to complete the send.  Check for a timeout.
    */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
   if (send_timeout(pstate))
     {
       /* Yes.. report the timeout */
@@ -419,7 +418,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
-#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
+#endif /* CONFIG_NET_SOCKOPTS */
 
   /* Continue waiting */
 
@@ -566,7 +565,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
           /* Set the initial time for calculating timeouts */
 
-#if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
+#ifdef CONFIG_NET_SOCKOPTS
           state.snd_time        = clock_systimer();
 #endif
           /* Set up the callback in the connection */
diff --git a/net/utils/net_timeval2dsec.c b/net/utils/net_timeval2dsec.c
index 12fafab7fd..78c2508673 100644
--- a/net/utils/net_timeval2dsec.c
+++ b/net/utils/net_timeval2dsec.c
@@ -38,7 +38,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#if defined(CONFIG_NET) && !defined(CONFIG_DISABLE_CLOCK)
 
 #include <nuttx/clock.h>
 
@@ -69,5 +68,3 @@ unsigned int net_timeval2dsec(struct timeval *tv)
 {
   return (unsigned int)(tv->tv_sec * DSEC_PER_SEC + tv->tv_usec / USEC_PER_DSEC);
 }
-
-#endif /* CONFIG_NET && !CONFIG_DISABLE_CLOCK */
diff --git a/net/utils/utils.h b/net/utils/utils.h
index e3e640c1df..6ecb47ce6c 100644
--- a/net/utils/utils.h
+++ b/net/utils/utils.h
@@ -67,9 +67,7 @@ extern "C"
  ****************************************************************************/
 
 struct net_driver_s;      /* Forward reference */
-#if !defined(CONFIG_DISABLE_CLOCK)
 struct timeval;           /* Forward reference */
-#endif
 
 /****************************************************************************
  * Function: net_lockinitialize
@@ -103,9 +101,7 @@ void net_lockinitialize(void);
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_DISABLE_CLOCK)
 void net_dsec2timeval(uint16_t dsec, FAR struct timeval *tv);
-#endif
 
 /****************************************************************************
  * Function: net_dsec2tick
@@ -140,9 +136,7 @@ unsigned int net_dsec2tick(int dsec);
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_DISABLE_CLOCK)
 unsigned int net_timeval2dsec(FAR struct timeval *tv);
-#endif
 
 /****************************************************************************
  * Name: tcp_chksum
diff --git a/sched/Kconfig b/sched/Kconfig
index f33f4b4e51..07d1194da3 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -23,10 +23,6 @@ menuconfig DISABLE_OS_API
 
 if DISABLE_OS_API
 
-config DISABLE_CLOCK
-	bool "Disable clock interfaces"
-	default n
-
 config DISABLE_POSIX_TIMERS
 	bool "Disable POSIX timers"
 	default y if DEFAULT_SMALL
diff --git a/sched/Makefile b/sched/Makefile
index da89d19d20..0f0a1c4c80 100644
--- a/sched/Makefile
+++ b/sched/Makefile
@@ -195,11 +195,7 @@ IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c
 
 CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(GRP_SRCS) $(SCHED_SRCS) $(WDOG_SRCS)
 CSRCS += $(TIME_SRCS) $(SEM_SRCS) $(TIMER_SRCS) $(PGFILL_SRCS)
-CSRCS += $(IRQ_SRCS)
-
-ifneq ($(CONFIG_DISABLE_CLOCK),y)
-CSRCS += $(CLOCK_SRCS)
-endif
+CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS)
 
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
 CSRCS += $(PTHREAD_SRCS)
diff --git a/sched/os_start.c b/sched/os_start.c
index 194b42ab2b..53cebdd8d4 100644
--- a/sched/os_start.c
+++ b/sched/os_start.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * sched/os_start.c
  *
- *   Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,14 +383,12 @@ void os_start(void)
 
   /* Initialize the POSIX timer facility (if included in the link) */
 
-#ifndef CONFIG_DISABLE_CLOCK
 #ifdef CONFIG_HAVE_WEAKFUNCTIONS
   if (clock_initialize != NULL)
 #endif
     {
       clock_initialize();
     }
-#endif
 
 #ifndef CONFIG_DISABLE_POSIX_TIMERS
 #ifdef CONFIG_HAVE_WEAKFUNCTIONS
diff --git a/sched/sched_processtimer.c b/sched/sched_processtimer.c
index 64329a79d5..e16d17e710 100644
--- a/sched/sched_processtimer.c
+++ b/sched/sched_processtimer.c
@@ -182,7 +182,6 @@ static inline void sched_process_timeslice(void)
 
 void sched_process_timer(void)
 {
-#ifndef CONFIG_DISABLE_CLOCK
   /* Increment the system time (if in the link) */
 
 #ifdef CONFIG_HAVE_WEAKFUNCTIONS
@@ -191,7 +190,6 @@ void sched_process_timer(void)
     {
       clock_timer();
     }
-#endif
 
 #if defined(CONFIG_SCHED_CPULOAD) && !defined(CONFIG_SCHED_CPULOAD_EXTCLK)
   /* Perform CPU load measurements (before any timer-initiated context
diff --git a/sched/timer_settime.c b/sched/timer_settime.c
index f5e28f4334..a09c818134 100644
--- a/sched/timer_settime.c
+++ b/sched/timer_settime.c
@@ -343,19 +343,12 @@ int timer_settime(timer_t timerid, int flags, FAR const struct itimerspec *value
 
   if ((flags & TIMER_ABSTIME) != 0)
     {
-#ifdef CONFIG_DISABLE_CLOCK
-      /* Absolute timing depends upon having access to clock functionality */
-
-      errno = ENOSYS;
-      return ERROR;
-#else
       /* Calculate a delay corresponding to the absolute time in 'value'.
        * NOTE:  We have internal knowledge the clock_abstime2ticks only
        * returns an error if clockid != CLOCK_REALTIME.
        */
 
       (void)clock_abstime2ticks(CLOCK_REALTIME, &value->it_value, &delay);
-#endif
     }
   else
     {
diff --git a/syscall/syscall.csv b/syscall/syscall.csv
index 19bdde9fd0..26adaf3a15 100644
--- a/syscall/syscall.csv
+++ b/syscall/syscall.csv
@@ -3,10 +3,10 @@
 "atexit","stdlib.h","defined(CONFIG_SCHED_ATEXIT)","int","void (*)(void)"
 "bind","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t"
 "clearenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","int"
-"clock_getres","time.h","!defined(CONFIG_DISABLE_CLOCK)","int","clockid_t","struct timespec*"
-"clock_gettime","time.h","!defined(CONFIG_DISABLE_CLOCK)","int","clockid_t","struct timespec*"
-"clock_settime","time.h","!defined(CONFIG_DISABLE_CLOCK)","int","clockid_t","const struct timespec*"
-"clock_systimer","nuttx/clock.h","!defined(CONFIG_DISABLE_CLOCK)","uint32_t"
+"clock_getres","time.h","","int","clockid_t","struct timespec*"
+"clock_gettime","time.h","","int","clockid_t","struct timespec*"
+"clock_settime","time.h","","int","clockid_t","const struct timespec*"
+"clock_systimer","nuttx/clock.h","","uint32_t"
 "close","unistd.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int"
 "closedir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR DIR*"
 "connect","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t"
@@ -22,7 +22,7 @@
 "getenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","FAR char*","FAR const char*"
 "getpid","unistd.h","","pid_t"
 "getsockopt","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int","int","FAR void*","FAR socklen_t*"
-"gettimeofday","sys/time.h","!defined(CONFIG_DISABLE_CLOCK)","int","struct timeval*","FAR void*"
+"gettimeofday","sys/time.h","","int","struct timeval*","FAR void*"
 "ioctl","sys/ioctl.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int","int","unsigned long"
 "kill","signal.h","!defined(CONFIG_DISABLE_SIGNALS)","int","pid_t","int"
 "listen","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int"
diff --git a/syscall/syscall_clock_systimer.c b/syscall/syscall_clock_systimer.c
index e92b615a4a..18801debbd 100644
--- a/syscall/syscall_clock_systimer.c
+++ b/syscall/syscall_clock_systimer.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * syscall/syscall_stublookup.c
+ * syscall/syscall_clock_systimer.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,6 @@
 
 #include <nuttx/clock.h>
 
-#ifndef CONFIG_DISABLE_CLOCK
-
 /****************************************************************************
  * Pre-processor definitions
  ****************************************************************************/
@@ -80,5 +78,3 @@ uint32_t syscall_clock_systimer(void)
 {
   return clock_systimer();
 }
-
-#endif /* !CONFIG_DISABLE_CLOCK */
diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h
index 4962474c5e..e5a9401480 100644
--- a/syscall/syscall_lookup.h
+++ b/syscall/syscall_lookup.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * syscall/syscall_lookup.h
  *
- *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -126,13 +126,11 @@ SYSCALL_LOOKUP(up_assert,                 2, STUB_up_assert)
  * NuttX configuration.
  */
 
-#ifndef CONFIG_DISABLE_CLOCK
   SYSCALL_LOOKUP(syscall_clock_systimer,  0, STUB_clock_systimer)
   SYSCALL_LOOKUP(clock_getres,            2, STUB_clock_getres)
   SYSCALL_LOOKUP(clock_gettime,           2, STUB_clock_gettime)
   SYSCALL_LOOKUP(clock_settime,           2, STUB_clock_settime)
   SYSCALL_LOOKUP(gettimeofday,            2, STUB_gettimeofday)
-#endif
 
 /* The following are defined only if POSIX timers are supported */