diff --git a/src/soc/amd/common/vboot/Makefile.inc b/src/soc/amd/common/vboot/Makefile.inc
index aff927a5d0..8a6f1162f8 100644
--- a/src/soc/amd/common/vboot/Makefile.inc
+++ b/src/soc/amd/common/vboot/Makefile.inc
@@ -4,3 +4,5 @@ verstage-y += vbnv_cmos.c
 romstage-y += vbnv_cmos.c
 ramstage-y += vbnv_cmos.c
 endif
+
+bootblock-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += vboot_bootblock.c
diff --git a/src/soc/amd/picasso/bootblock/vboot_bootblock.c b/src/soc/amd/common/vboot/vboot_bootblock.c
similarity index 100%
rename from src/soc/amd/picasso/bootblock/vboot_bootblock.c
rename to src/soc/amd/common/vboot/vboot_bootblock.c
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 5f4ab9bddb..f010c7b055 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -23,7 +23,6 @@ bootblock-y += gpio.c
 bootblock-y += smi_util.c
 bootblock-y += config.c
 bootblock-y += reset.c
-bootblock-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += bootblock/vboot_bootblock.c
 
 romstage-y += i2c.c
 romstage-y += romstage.c