From b393fa09e565af929474c442a62589ad1d73acbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 21 Jun 2014 23:50:53 +0300 Subject: AGESA S3: Fix ACPISCRATCH in CBMEM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/6093 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Edward O'Callaghan Reviewed-by: Martin Roth --- src/Kconfig | 4 ---- src/include/cbmem.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src') 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 -- cgit v1.2.3