4 files changed, 2 insertions, 5 deletions
diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc
index 6447acf1d6..b20ae24d60 100644
--- a/src/soc/qualcomm/ipq40xx/Makefile.inc
+++ b/src/soc/qualcomm/ipq40xx/Makefile.inc
@@ -16,7 +16,6 @@
 ifeq ($(CONFIG_SOC_QC_IPQ40XX),y)
 
 bootblock-y += clock.c
-bootblock-y += cbmem.c
 bootblock-y += gpio.c
 bootblock-$(CONFIG_SPI_FLASH) += spi.c
 bootblock-y += timer.c
@@ -43,7 +42,6 @@ romstage-y += blsp.c
 romstage-y += qup.c
 
 ramstage-y += blobs_init.c
-ramstage-y += cbmem.c
 ramstage-y += clock.c
 ramstage-y += gpio.c
 ramstage-y += lcc.c
diff --git a/src/soc/qualcomm/ipq40xx/cbmem.c b/src/soc/qualcomm/ipq40xx/cbmem.c
index 972c6258c9..9970758d91 100644
--- a/src/soc/qualcomm/ipq40xx/cbmem.c
+++ b/src/soc/qualcomm/ipq40xx/cbmem.c
@@ -31,7 +31,7 @@ void *cbmem_top_chipset(void)
 	 * with components that utilize cbmem in romstage (e.g. vboot_locator
 	 * for loading ipq blobs before DRAM is initialized).
 	 */
-	if (ENV_ROMSTAGE && (cbmem_backing_store_ready == 0))
+	if (cbmem_backing_store_ready == 0)
 		return NULL;
 
 	return _memlayout_cbmem_top;
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 1fd134a7b3..67d54d2b98 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -42,7 +42,6 @@ romstage-y += gsbi.c
 romstage-y += qup.c
 
 ramstage-y += blobs_init.c
-ramstage-y += cbmem.c
 ramstage-y += clock.c
 ramstage-y += gpio.c
 ramstage-y += lcc.c
diff --git a/src/soc/qualcomm/ipq806x/cbmem.c b/src/soc/qualcomm/ipq806x/cbmem.c
index 6dc92a0c11..32f303e81e 100644
--- a/src/soc/qualcomm/ipq806x/cbmem.c
+++ b/src/soc/qualcomm/ipq806x/cbmem.c
@@ -32,7 +32,7 @@ void *cbmem_top_chipset(void)
 	 * (e.g. vboot_locator for loading ipq blobs before DRAM is
 	 * initialized).
 	 */
-	if (ENV_ROMSTAGE && (cbmem_backing_store_ready == 0))
+	if (cbmem_backing_store_ready == 0)
 		return NULL;
 
 	return _memlayout_cbmem_top;