From 9900c4f0b041cb0ac1c958500453a803beda3c8c Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 24 Nov 2020 18:02:39 +0100 Subject: [PATCH] soc/amd: move vboot bootblock functions to common folder Change-Id: I9e9fed26a686b8f90797687dd720902be48dae72 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/47975 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/vboot/Makefile.inc | 2 ++ .../amd/{picasso/bootblock => common/vboot}/vboot_bootblock.c | 0 src/soc/amd/picasso/Makefile.inc | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) rename src/soc/amd/{picasso/bootblock => common/vboot}/vboot_bootblock.c (100%) 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