New patch to review for coreboot: 641e264 AGESA S3: Fix ACPISCRATCH in CBMEM

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6093

-gerrit

commit 641e264b87066144fcada897bd41924e86a8d1ff
Author: Kyösti Mälkki 
Date:   Sat Jun 21 23:50:53 2014 +0300

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 
---
 src/Kconfig         | 4 ----
 src/include/cbmem.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 061f63e..7846f9e 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 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