diff --git a/src/Kconfig b/src/Kconfig
index e4ddf0cc70..89849eca02 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -677,12 +677,12 @@ config TIMER_QUEUE
 
 config COOP_MULTITASKING
 	def_bool n
-	depends on TIMER_QUEUE && ARCH_X86 && CPU_INFO_V2
+	select TIMER_QUEUE
+	depends on ARCH_X86 && CPU_INFO_V2
 	help
 	  Cooperative multitasking allows callbacks to be multiplexed on the
-	  main thread of ramstage. With this enabled it allows for multiple
-	  execution paths to take place when they have udelay() calls within
-	  their code.
+	  main thread. With this enabled it allows for multiple execution paths
+	  to take place when they have udelay() calls within their code.
 
 config NUM_THREADS
 	int
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 65bf2bf001..f36f9126e7 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -73,7 +73,6 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_FSP_DMI_TABLES
 	select SOC_AMD_COMMON_FSP_PCI
 	select SSE2
-	select TIMER_QUEUE
 	select UDK_2017_BINDING
 	select X86_AMD_FIXED_MTRRS
 	select X86_AMD_INIT_SIPI