Zheng Bao (zheng.bao@amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2384
-gerrit
commit 726b3498bf1e72a1bff76e52425bb88d89a6f197 Author: Zheng Bao fishbaozi@gmail.com Date: Sun Feb 17 16:25:36 2013 +0800
AMD S3: Include the s3_resume.h only when S3 is enabled.
Change-Id: I9a6c4f61e5dda6665f92c8526bb26a458ee2b739 Signed-off-by: Zheng Bao zheng.bao@amd.com Signed-off-by: Zheng Bao fishbaozi@gmail.com --- src/cpu/amd/agesa/family14/model_14_init.c | 2 ++ src/cpu/amd/agesa/family15tn/model_15_init.c | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c index 9cc36e2..7fac016 100644 --- a/src/cpu/amd/agesa/family14/model_14_init.c +++ b/src/cpu/amd/agesa/family14/model_14_init.c @@ -33,7 +33,9 @@ #include <cpu/x86/mtrr.h> #include <cpu/amd/amdfam14.h> #include <arch/acpi.h> +#if CONFIG_HAVE_ACPI_RESUME #include <cpu/amd/agesa/s3_resume.h> +#endif
#define MCI_STATUS 0x401
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c index 39533bb..68cb0d2 100644 --- a/src/cpu/amd/agesa/family15tn/model_15_init.c +++ b/src/cpu/amd/agesa/family15tn/model_15_init.c @@ -33,7 +33,9 @@ #include <cpu/x86/mtrr.h> #include <cpu/amd/amdfam15.h> #include <arch/acpi.h> +#if CONFIG_HAVE_ACPI_RESUME #include <cpu/amd/agesa/s3_resume.h> +#endif
msr_t rdmsr_amd(u32 index) {