diff options
Diffstat (limited to 'src/soc/amd/common')
| -rw-r--r-- | src/soc/amd/common/block/pi/Kconfig | 5 | ||||
| -rw-r--r-- | src/soc/amd/common/block/pi/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/block/pi/s3_resume.c (renamed from src/soc/amd/common/block/s3/s3_resume.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/block/s3/Kconfig | 7 | ||||
| -rw-r--r-- | src/soc/amd/common/block/s3/Makefile.inc | 6 |
5 files changed, 6 insertions, 14 deletions
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 index 2094931dca..2094931dca 100644 --- a/src/soc/amd/common/block/s3/s3_resume.c +++ b/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 |