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>
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index e88c2f7..a4f4ad5 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