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

Fix Persimmon build without S3. 

In the heap function, only check for S3 check when it is built in
with CONFIG_HAVE_ACPI_RESUME.

Change-Id: I439275a4e1b7b446b499bcf90c925785a14b980d
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/1034
Tested-by: build bot (Jenkins)
Reviewed-by: Steve Goodrich <steve.goodrich@se-eng.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Marc Jones 2012-05-15 16:08:24 -06:00 committed by Marc Jones
parent ba3711cc24
commit ad422c0a7a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/amd/persimmon/agesawrapper.c
View File

@ -253,10 +253,12 @@ UINT32 GetHeapBase(
{ {
UINT32 heap; UINT32 heap;
#if CONFIG_HAVE_APCI_RESUME
/* Both romstage and ramstage has this S3 detect. */ /* Both romstage and ramstage has this S3 detect. */
if (acpi_get_sleep_type() == 3) if (acpi_get_sleep_type() == 3)
heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* himem_heap_base + high_stack_size */ heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* himem_heap_base + high_stack_size */
else else
#endif
heap = BIOS_HEAP_START_ADDRESS; /* low mem */ heap = BIOS_HEAP_START_ADDRESS; /* low mem */
return heap; return heap;