From ec54445cd4f2ac2337091e7201680ba38b988cd0 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 11 Feb 2021 04:57:50 +0100 Subject: [PATCH] soc/amd/picasso/psp: move to common code and rename to psp_smm_gen2 Change-Id: I771a7d36eea7307754386824190624a09c0e38f7 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/50515 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/soc/amd/common/block/psp/Makefile.inc | 1 + src/soc/amd/{picasso/psp.c => common/block/psp/psp_smm_gen2.c} | 0 src/soc/amd/picasso/Makefile.inc | 3 --- 3 files changed, 1 insertion(+), 3 deletions(-) rename src/soc/amd/{picasso/psp.c => common/block/psp/psp_smm_gen2.c} (100%) diff --git a/src/soc/amd/common/block/psp/Makefile.inc b/src/soc/amd/common/block/psp/Makefile.inc index 907f0ef147..3bb03f7e81 100644 --- a/src/soc/amd/common/block/psp/Makefile.inc +++ b/src/soc/amd/common/block/psp/Makefile.inc @@ -20,5 +20,6 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PSP_GEN2),y) romstage-y += psp_gen2.c ramstage-y += psp_gen2.c smm-y += psp_gen2.c +smm-y += psp_smm_gen2.c endif # CONFIG_SOC_AMD_COMMON_BLOCK_PSP_GEN2 diff --git a/src/soc/amd/picasso/psp.c b/src/soc/amd/common/block/psp/psp_smm_gen2.c similarity index 100% rename from src/soc/amd/picasso/psp.c rename to src/soc/amd/common/block/psp/psp_smm_gen2.c diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index d81eddc59d..e92de1f588 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -25,7 +25,6 @@ romstage-y += gpio.c romstage-y += reset.c romstage-y += memmap.c romstage-y += uart.c -romstage-y += psp.c romstage-y += mrc_cache.c verstage-y += i2c.c @@ -50,7 +49,6 @@ ramstage-y += memmap.c ramstage-y += uart.c ramstage-y += finalize.c ramstage-y += soc_util.c -ramstage-y += psp.c ramstage-y += fsp_params.c ramstage-y += update_microcode.c ramstage-y += graphics.c @@ -63,7 +61,6 @@ ifeq ($(CONFIG_DEBUG_SMI),y) smm-y += uart.c endif smm-y += gpio.c -smm-y += psp.c smm-y += smu.c CPPFLAGS_common += -I$(src)/soc/amd/picasso