diff --git a/src/Kconfig b/src/Kconfig
index 18b5bad823..c3cc6bffc6 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -189,7 +189,7 @@ config DYNAMIC_CBMEM
 
 config COLLECT_TIMESTAMPS
 	bool "Create a table of timestamps collected during boot"
-	depends on EARLY_CBMEM_INIT
+	depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM)
 	help
 	  Make coreboot create a table of timer-ID/timer-value pairs to
 	  allow measuring time spent at different phases of the boot process.
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 7fbed4aafd..d2cff572aa 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -219,7 +219,7 @@ config CONSOLE_NE2K_IO_PORT
 	  boundary, qemu needs broader align)
 
 config CONSOLE_CBMEM
-	depends on EARLY_CBMEM_INIT
+	depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM)
 	bool "Send console output to a CBMEM buffer"
 	default n
 	help
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 6193e63cdb..02c42a8626 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -47,7 +47,8 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
 romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
 romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
 romstage-$(CONFIG_USBDEBUG) += usbdebug.c
-romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c cbmem.c
+romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
+romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
 romstage-y += compute_ip_checksum.c
 romstage-y += memmove.c
 romstage-$(CONFIG_ARCH_X86) += gcc.c