GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-06-21 23:50:53 +03:00
parent 4f7cb87df2
commit b393fa09e5
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kconfig
View File

@ -337,10 +337,6 @@ config NUM_THREADS
help help
How many execution threads to cooperatively multitask with. How many execution threads to cooperatively multitask with.
config HIGH_SCRATCH_MEMORY_SIZE
hex
default 0x0
config HAVE_OPTION_TABLE config HAVE_OPTION_TABLE
bool bool
default n default n

2
src/include/cbmem.h
View File

@ -29,7 +29,7 @@
#endif #endif
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \ #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 #define HIGH_MEMORY_SCRATCH CONFIG_HIGH_SCRATCH_MEMORY_SIZE
#else #else
#define HIGH_MEMORY_SCRATCH 0 #define HIGH_MEMORY_SCRATCH 0