GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "AMD OemS3Save: refactor for Merlin Falcon" 

This reverts commit d3deecdd9c.

Do not mix open-source AGESA and binary PI trees. Once you have
working S3 support for binaryPI platforms, add the adapted
oem_s3.c file as northbridge/amd/pi/oem_s3.c instead.

Change-Id: I7c981d0023a5c0225e046f9c0104acfa07436b79
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/12282
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2015-10-31 18:06:52 +02:00
parent 42d55e0caf
commit bb85f9eb73
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/northbridge/amd/agesa/agesawrapper.h
View File

@ -70,6 +70,6 @@ extern const struct OEM_HOOK OemCustomize;
/* For suspend-to-ram support. */ /* For suspend-to-ram support. */
AGESA_STATUS OemInitResume(AMD_RESUME_PARAMS *ResumeParams); AGESA_STATUS OemInitResume(AMD_RESUME_PARAMS *ResumeParams);
AGESA_STATUS OemS3LateRestore(AMD_S3LATE_PARAMS *S3LateParams); AGESA_STATUS OemS3LateRestore(AMD_S3LATE_PARAMS *S3LateParams);
AGESA_STATUS OemS3Save(void *vS3SaveParams); AGESA_STATUS OemS3Save(AMD_S3SAVE_PARAMS *S3SaveParams);
#endif /* _AGESAWRAPPER_H_ */ #endif /* _AGESAWRAPPER_H_ */

8
src/northbridge/amd/agesa/oem_s3.c
View File

@ -113,15 +113,9 @@ static int spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len)
static u8 MTRRStorage[S3_DATA_MTRR_SIZE]; static u8 MTRRStorage[S3_DATA_MTRR_SIZE];
AGESA_STATUS OemS3Save(void *vS3SaveParams) AGESA_STATUS OemS3Save(AMD_S3SAVE_PARAMS *S3SaveParams)
{ {
#if IS_ENABLED(CONFIG_CPU_AMD_PI_00660F01)
AMD_RTB_PARAMS *S3SaveParams = (AMD_RTB_PARAMS *)vS3SaveParams;
S3_DATA_BLOCK *dataBlock = &S3SaveParams->S3DataBlock;
#else
AMD_S3SAVE_PARAMS *S3SaveParams = (AMD_S3SAVE_PARAMS *)vS3SaveParams;
AMD_S3_PARAMS *dataBlock = &S3SaveParams->S3DataBlock; AMD_S3_PARAMS *dataBlock = &S3SaveParams->S3DataBlock;
#endif
u32 MTRRStorageSize = 0; u32 MTRRStorageSize = 0;
uintptr_t pos, size; uintptr_t pos, size;