summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@se-eng.com>2012-05-15 16:08:24 -0600
committerMarc Jones <marcj303@gmail.com>2012-05-21 19:07:49 +0200
commitad422c0a7a90093fd14b386cf8f0802fce64b2cb (patch)
tree6edd912d9afd9847235c29c725884738b941b34e /src
parentba3711cc24adbef23e65d398dd651143d21666a4 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/persimmon/agesawrapper.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c
index 0d63abb02b..195ff54f3b 100644
--- a/src/mainboard/amd/persimmon/agesawrapper.c
+++ b/src/mainboard/amd/persimmon/agesawrapper.c
@@ -253,10 +253,12 @@ UINT32 GetHeapBase(
{
UINT32 heap;
+#if CONFIG_HAVE_APCI_RESUME
/* Both romstage and ramstage has this S3 detect. */
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 */
else
+#endif
heap = BIOS_HEAP_START_ADDRESS; /* low mem */
return heap;