diff --git a/src/soc/broadcom/cygnus/cbmem.c b/src/soc/broadcom/cygnus/cbmem.c
index 4532b7e01c..6b11a95fb6 100644
--- a/src/soc/broadcom/cygnus/cbmem.c
+++ b/src/soc/broadcom/cygnus/cbmem.c
@@ -19,8 +19,10 @@
 
 #include <cbmem.h>
 #include <stddef.h>
+#include <symbols.h>
+#include <soc/sdram.h>
 
 void *cbmem_top(void)
 {
-	return NULL;
+	return _dram + sdram_size_mb()*MiB;
 }
diff --git a/src/soc/broadcom/cygnus/romstage.c b/src/soc/broadcom/cygnus/romstage.c
index f293f31d2a..13a0d4f0d6 100644
--- a/src/soc/broadcom/cygnus/romstage.c
+++ b/src/soc/broadcom/cygnus/romstage.c
@@ -35,25 +35,13 @@
 
 void main(void)
 {
-#if CONFIG_COLLECT_TIMESTAMPS
-	uint64_t start_romstage_time;
-	uint64_t before_dram_time;
-	uint64_t after_dram_time;
-	uint64_t base_time = timestamp_get();
-	start_romstage_time = timestamp_get();
-#endif
+	timestamp_add_now(TS_START_ROMSTAGE);
 
 	console_init();
 
-#if CONFIG_COLLECT_TIMESTAMPS
-	before_dram_time = timestamp_get();
-#endif
-
+	timestamp_add_now(TS_BEFORE_INITRAM);
 	sdram_init();
-
-#if CONFIG_COLLECT_TIMESTAMPS
-	after_dram_time = timestamp_get();
-#endif
+	timestamp_add_now(TS_AFTER_INITRAM);
 
 	/* Now that DRAM is up, add mappings for it and DMA coherency buffer. */
 	mmu_config_range((uintptr_t)_dram/MiB,
@@ -63,14 +51,5 @@ void main(void)
 
 	cbmem_initialize_empty();
 
-#if CONFIG_COLLECT_TIMESTAMPS
-	timestamp_init(base_time);
-	timestamp_add(TS_START_ROMSTAGE, start_romstage_time);
-	timestamp_add(TS_BEFORE_INITRAM, before_dram_time);
-	timestamp_add(TS_AFTER_INITRAM, after_dram_time);
-
-	timestamp_add_now(TS_END_ROMSTAGE);
-#endif
-
 	run_ramstage();
 }