diff --git a/src/mainboard/google/storm/mmu.c b/src/mainboard/google/storm/mmu.c
index fcea8e22ad..da157958a2 100644
--- a/src/mainboard/google/storm/mmu.c
+++ b/src/mainboard/google/storm/mmu.c
@@ -11,6 +11,8 @@
  */
 
 #include <arch/cache.h>
+#include <rules.h>
+#include <soc/soc_services.h>
 #include <symbols.h>
 #include "mmu.h"
 
@@ -34,8 +36,10 @@ void setup_dram_mappings(enum dram_state dram)
 		mmu_config_range(DRAM_START, DRAM_SIZE, DCACHE_WRITEBACK);
 		/* Map DMA memory */
 		mmu_config_range(DMA_START, DMA_SIZE, DCACHE_OFF);
+#if ENV_ROMSTAGE
 		/* Mark cbmem backing store as ready. */
 		ipq_cbmem_backing_store_ready();
+#endif
 	} else {
 		mmu_disable_range(DRAM_START, DRAM_SIZE);
 		/* Map DMA memory */