From c0982abf86a6312e2572cc0225bbfe702c7ff2bd Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 23 Sep 2021 15:28:51 +0200 Subject: [PATCH] soc/amd/common/block: move binaryPI S3 block into PI block The code in soc/amd/common/block/s3 is specific to the AMD binaryPI coreboot integration, so move the code to soc/amd/common/block/pi. This drops the SOC_AMD_COMMON_BLOCK_S3 Kconfig option and integrates the dependencies and selections into the SOC_AMD_COMMON_BLOCK_PI Kconfig option. Since only selecting SOC_AMD_COMMON_BLOCK_PI but not SOC_AMD_COMMON_BLOCK_S3 resulted in missing functions in the linking process, we don't lose support for any working configuration by only having one Kconfig option for both parts. Signed-off-by: Felix Held Change-Id: Ib2bd99a88d8b05216688bc45d9c4f23a007ce870 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57883 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- src/soc/amd/common/block/pi/Kconfig | 5 ++++- src/soc/amd/common/block/pi/Makefile.inc | 2 ++ src/soc/amd/common/block/{s3 => pi}/s3_resume.c | 0 src/soc/amd/common/block/s3/Kconfig | 7 ------- src/soc/amd/common/block/s3/Makefile.inc | 6 ------ src/soc/amd/stoneyridge/Kconfig | 1 - 6 files changed, 6 insertions(+), 15 deletions(-) rename src/soc/amd/common/block/{s3 => pi}/s3_resume.c (100%) delete mode 100644 src/soc/amd/common/block/s3/Kconfig delete mode 100644 src/soc/amd/common/block/s3/Makefile.inc diff --git a/src/soc/amd/common/block/pi/Kconfig b/src/soc/amd/common/block/pi/Kconfig index d2a2a6ad9b..b872c13484 100644 --- a/src/soc/amd/common/block/pi/Kconfig +++ b/src/soc/amd/common/block/pi/Kconfig @@ -1,9 +1,12 @@ config SOC_AMD_COMMON_BLOCK_PI bool + depends on SOC_AMD_COMMON_BLOCK_ACPI + select CACHE_MRC_SETTINGS select HAVE_DEBUG_RAM_SETUP + select MRC_WRITE_NV_LATE help This option builds functions that interface AMD's AGESA reference - code packaged in the binaryPI form. + code packaged in the binaryPI form and S3-related functionality. if SOC_AMD_COMMON_BLOCK_PI diff --git a/src/soc/amd/common/block/pi/Makefile.inc b/src/soc/amd/common/block/pi/Makefile.inc index 7b5d73af9c..59f075ddd7 100644 --- a/src/soc/amd/common/block/pi/Makefile.inc +++ b/src/soc/amd/common/block/pi/Makefile.inc @@ -5,6 +5,7 @@ romstage-y += def_callouts.c romstage-y += heapmanager.c romstage-y += image.c romstage-y += refcode_loader.c +romstage-y += s3_resume.c ramstage-y += agesawrapper.c ramstage-y += amd_late_init.c @@ -13,5 +14,6 @@ ramstage-y += def_callouts.c ramstage-y += heapmanager.c ramstage-y += image.c ramstage-y += refcode_loader.c +ramstage-y += s3_resume.c endif # CONFIG_SOC_AMD_COMMON_BLOCK_PI diff --git a/src/soc/amd/common/block/s3/s3_resume.c b/src/soc/amd/common/block/pi/s3_resume.c similarity index 100% rename from src/soc/amd/common/block/s3/s3_resume.c rename to src/soc/amd/common/block/pi/s3_resume.c diff --git a/src/soc/amd/common/block/s3/Kconfig b/src/soc/amd/common/block/s3/Kconfig deleted file mode 100644 index 797a59864a..0000000000 --- a/src/soc/amd/common/block/s3/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -config SOC_AMD_COMMON_BLOCK_S3 - bool - depends on SOC_AMD_COMMON_BLOCK_ACPI - select CACHE_MRC_SETTINGS - select MRC_WRITE_NV_LATE - help - Select this option to add S3 related functions to the build. diff --git a/src/soc/amd/common/block/s3/Makefile.inc b/src/soc/amd/common/block/s3/Makefile.inc deleted file mode 100644 index 03395eca9c..0000000000 --- a/src/soc/amd/common/block/s3/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_S3),y) - -romstage-y += s3_resume.c -ramstage-y += s3_resume.c - -endif # CONFIG_SOC_AMD_COMMON_BLOCK_S3 diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 08b2ef4db6..b07b4c9181 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -39,7 +39,6 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_PI select SOC_AMD_COMMON_BLOCK_PM select SOC_AMD_COMMON_BLOCK_PSP_GEN1 - select SOC_AMD_COMMON_BLOCK_S3 select SOC_AMD_COMMON_BLOCK_SATA select SOC_AMD_COMMON_BLOCK_SMBUS select SOC_AMD_COMMON_BLOCK_SMI