diff --git a/src/mainboard/google/herobrine/romstage.c b/src/mainboard/google/herobrine/romstage.c
index 2ea78b8..97ce5a7 100644
--- a/src/mainboard/google/herobrine/romstage.c
+++ b/src/mainboard/google/herobrine/romstage.c
@@ -5,6 +5,7 @@
 #include <soc/qclib_common.h>
 #include "board.h"
 #include <soc/shrm.h>
+#include <soc/cpucp.h>
 
 static void prepare_usb(void)
 {
@@ -18,6 +19,7 @@
 void platform_romstage_main(void)
 {
 	shrm_fw_load_reset();
+	cpucp_prepare();
 	/* QCLib: DDR init & train */
 	qclib_load_and_run();
 	prepare_usb();
diff --git a/src/soc/qualcomm/sc7280/Makefile.inc b/src/soc/qualcomm/sc7280/Makefile.inc
index 85508e9..a20d49b 100644
--- a/src/soc/qualcomm/sc7280/Makefile.inc
+++ b/src/soc/qualcomm/sc7280/Makefile.inc
@@ -27,6 +27,7 @@
 ################################################################################
 romstage-y += cbmem.c
 romstage-y += shrm_load_reset.c
+romstage-y += cpucp_load_reset.c
 romstage-y += ../common/qclib.c
 romstage-y += ../common/mmu.c
 romstage-y += mmu.c
diff --git a/src/soc/qualcomm/sc7280/cpucp_load_reset.c b/src/soc/qualcomm/sc7280/cpucp_load_reset.c
index cfb1687..6f8f51f 100644
--- a/src/soc/qualcomm/sc7280/cpucp_load_reset.c
+++ b/src/soc/qualcomm/sc7280/cpucp_load_reset.c
@@ -11,13 +11,11 @@
 
 void cpucp_prepare(void)
 {
-	/* allow NS access to EPSS memory*/
+	/* allow NS access to EPSS memory */
 	setbits32(&epss_top->access_override, 0x1);
 
-	/* Enable subsystem clock. Required for CPUCP PDMEM access*/
+	/* Enable subsystem clock. Required for CPUCP PDMEM access */
 	setbits32(&epss_fast->epss_muc_clk_ctrl, 0x1);
-	if (!wait_ms(300, ((read32(&epss_fast->epss_muc_clk_ctrl) & 0x1) != 0x1)))
-		printk(BIOS_ERR, "%s: cannot get CPUCP PDMEM access.\n", __func__);
 }
 
 void cpucp_fw_load_reset(void)
@@ -25,7 +23,8 @@
 	struct prog cpucp_fw_prog =
 		PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/cpucp");
 
-	cpucp_prepare();
+	if (!wait_ms(300, (read32(&epss_fast->epss_muc_clk_ctrl) & 0x1) == 0x1))
+		printk(BIOS_ERR, "%s: cannot get CPUCP PDMEM access.\n", __func__);
 
 	if (!selfload(&cpucp_fw_prog))
 		die("SOC image: CPUCP load failed");