Paul Menzel (paulepanter@users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2528
-gerrit
commit bde909390f49302a873b8b86f7dc15ca1dd4f0c6 Author: Jens Rottmann JRottmann@LiPPERTembedded.de Date: Tue Feb 26 12:37:22 2013 +0100
AGESA: skip s3_resume.h if CONFIG_HAVE_ACPI_RESUME is disabled
Commit »AMD S3: Introduce Kconfig variable 'S3_DATA_SIZE'« (22ec9f9a) [1] introduced a check throwing an error if S3_DATA_SIZE isn't big enough.
However without CONFIG_HAVE_ACPI_RESUME the variable S3_DATA_SIZE isn't defined at all and compilation will fail if s3_resume.h is included.
This patch makes it again possible turn off HAVE_ACPI_RESUME relatively easily in Parmer/Thatcher/Persimmon's Kconfig if you don't care about S3 and don't want flash writes on every boot.
[1] http://review.coreboot.org/2383
Change-Id: I999e4b7634bf172d8380fd14cba6f7f03468fee3 Signed-off-by: Jens Rottmann JRottmann@LiPPERTembedded.de Reviewed-by: Dave Frodin dave.frodin@se-eng.com Reviewed-by: Marc Jones marcj303@gmail.com --- src/cpu/amd/agesa/s3_resume.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h index af5b509..441e952 100644 --- a/src/cpu/amd/agesa/s3_resume.h +++ b/src/cpu/amd/agesa/s3_resume.h @@ -20,6 +20,8 @@ #ifndef S3_RESUME_H #define S3_RESUME_H
+#if CONFIG_HAVE_ACPI_RESUME + /* The size needs to be 4k aligned, which is the sector size of most flashes. */ #define S3_DATA_VOLATILE_SIZE 0x6000 #define S3_DATA_MTRR_SIZE 0x1000 @@ -48,3 +50,5 @@ void OemAgesaGetS3Info (S3_DATA_TYPE S3DataType, u32 *DataSize, void **Data); void OemAgesaSaveMtrr (void);
#endif + +#endif