diff --git a/boards/x86_64/intel64/qemu-intel64/configs/earlyfb/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/earlyfb/defconfig
index 6f425aa3540..9ed7f1f5b3b 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/earlyfb/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/earlyfb/defconfig
@@ -51,8 +51,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_IRQMONITOR=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/fb/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/fb/defconfig
index e730b3116c9..8db5debca2e 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/fb/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/fb/defconfig
@@ -60,8 +60,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_THREAD_LOCAL=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/jumbo/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/jumbo/defconfig
index d22bd78fc24..e9267b03690 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/jumbo/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/jumbo/defconfig
@@ -85,7 +85,6 @@ CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_ONESHOT=y
 CONFIG_PCI=y
 CONFIG_PCI_MSIX=y
 CONFIG_PCI_QEMU_EDU=y
@@ -101,8 +100,6 @@ CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_IRQMONITOR=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_SMP=y
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs/defconfig
index 9da96b7c65c..48fb597f0d2 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs/defconfig
@@ -75,8 +75,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs_pci/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs_pci/defconfig
index 83599c33fc6..c1b824e9afc 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs_pci/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/knsh_romfs_pci/defconfig
@@ -79,8 +79,6 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/lvgl/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/lvgl/defconfig
index 4e139429ff6..47eb29a8bf8 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/lvgl/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/lvgl/defconfig
@@ -57,8 +57,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_THREAD_LOCAL=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
index 59b65daca3a..90451791d82 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
@@ -46,8 +46,6 @@ CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_THREAD_LOCAL=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci/defconfig
index 689c1ab33e8..723df5c0eb9 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci/defconfig
@@ -41,7 +41,6 @@ CONFIG_INTEL64_ONESHOT=y
 CONFIG_LIBM=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_ONESHOT=y
 CONFIG_PCI=y
 CONFIG_PCI_MSIX=y
 CONFIG_PREALLOC_CHILDSTATUS=16
@@ -54,8 +53,6 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci_smp/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci_smp/defconfig
index 375b9690d25..af9e659e9b8 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci_smp/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/nsh_pci_smp/defconfig
@@ -43,7 +43,6 @@ CONFIG_LIBM=y
 CONFIG_MM_IOB=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_ONESHOT=y
 CONFIG_PCI=y
 CONFIG_PCI_MSIX=y
 CONFIG_PREALLOC_CHILDSTATUS=16
@@ -56,8 +55,6 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_SMP=y
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
index ed0585683f2..77276d76026 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
@@ -39,8 +39,6 @@ CONFIG_RAM_SIZE=268435456
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_TICKLESS=y
-CONFIG_SCHED_TICKLESS_ALARM=y
-CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_START_DAY=3
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
index b0ea8817542..4c60fb0dc45 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
@@ -34,7 +34,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 
-#ifdef CONFIG_ONESHOT
+#ifdef CONFIG_INTEL64_ONESHOT
 #  include <nuttx/timers/oneshot.h>
 #endif
 
@@ -71,7 +71,7 @@
 
 int qemu_bringup(void)
 {
-#ifdef CONFIG_ONESHOT
+#ifdef CONFIG_INTEL64_ONESHOT
   struct oneshot_lowerhalf_s *os = NULL;
 #endif
 
@@ -104,7 +104,7 @@ int qemu_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ONESHOT
+#ifdef CONFIG_INTEL64_ONESHOT
   os = oneshot_initialize(ONESHOT_TIMER, 10);
   if (os)
     {