From 030902b774c672df217d9862fe73fade9c5265b1 Mon Sep 17 00:00:00 2001 From: Jens Rottmann Date: Tue, 26 Feb 2013 12:37:22 +0100 Subject: AGESA: skip s3_resume.h if CONFIG_HAVE_ACPI_RESUME is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Dave Frodin Reviewed-by: Marc Jones Reviewed-on: http://review.coreboot.org/2528 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/cpu/amd/agesa/s3_resume.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h index af5b509adb..441e952b0a 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 -- cgit v1.2.3