soc/amd: move vboot bootblock functions to common folder

Change-Id: I9e9fed26a686b8f90797687dd720902be48dae72
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47975
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
diff --git a/src/soc/amd/common/vboot/Makefile.inc b/src/soc/amd/common/vboot/Makefile.inc
index aff927a..8a6f116 100644
--- a/src/soc/amd/common/vboot/Makefile.inc
+++ b/src/soc/amd/common/vboot/Makefile.inc
@@ -4,3 +4,5 @@
 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 5f4ab9b..f010c7b 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -23,7 +23,6 @@
 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