diff --git a/payloads/libpayload/drivers/timer/Kconfig b/payloads/libpayload/drivers/timer/Kconfig
index bcf4b06e39..9e274ee00e 100644
--- a/payloads/libpayload/drivers/timer/Kconfig
+++ b/payloads/libpayload/drivers/timer/Kconfig
@@ -10,15 +10,14 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
-config TIMER_RDTSC
-	bool
-	default y
-	depends on ARCH_X86
-
 choice
 	prompt "Timer driver"
-	default TIMER_NONE
-	depends on !ARCH_X86
+	default TIMER_NONE if !ARCH_X86
+	default TIMER_RDTSC if ARCH_X86
+
+config TIMER_RDTSC
+	bool "x86 rdtsc"
+	depends on ARCH_X86
 
 config TIMER_NONE
 	bool "None"