diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-21 23:50:53 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-25 06:23:07 +0200 |
| commit | b393fa09e565af929474c442a62589ad1d73acbf (patch) | |
| tree | b15162b59e772872463a4b938a73ccec4a4f35dc | |
| parent | 4f7cb87df2a4b2d1da6c1e759a3a69bc36626850 (diff) | |
AGESA S3: Fix ACPISCRATCH in CBMEM
After commit
2ca2afe ACPI S3 support: Add acpi_s3_resume_allowed()
ACPISCRATCH region in CBMEM was no longer allocated, causing
AGESA platforms to fail S3 resume.
IS_ENABLED() did not evaluate true here with non-zero parameter.
Also avoid multiple defined defaults for HIGH_SCRATCH_MEMORY_SIZE.
Change-Id: Id99e4bee91581b8ac3d1ec44763b2d792b721832
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6093
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Martin Roth <gaumless@gmail.com>
| -rw-r--r-- | src/Kconfig | 4 | ||||
| -rw-r--r-- | src/include/cbmem.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/Kconfig b/src/Kconfig index 061f63eee8..7846f9eeae 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -337,10 +337,6 @@ config NUM_THREADS help How many execution threads to cooperatively multitask with. -config HIGH_SCRATCH_MEMORY_SIZE - hex - default 0x0 - config HAVE_OPTION_TABLE bool default n diff --git a/src/include/cbmem.h b/src/include/cbmem.h index e88c2f71af..a4f4ad54b2 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -29,7 +29,7 @@ #endif #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \ - IS_ENABLED(CONFIG_HIGH_SCRATCH_MEMORY_SIZE) + defined(CONFIG_HIGH_SCRATCH_MEMORY_SIZE) #define HIGH_MEMORY_SCRATCH CONFIG_HIGH_SCRATCH_MEMORY_SIZE #else #define HIGH_MEMORY_SCRATCH 0 |