From ad422c0a7a90093fd14b386cf8f0802fce64b2cb Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Tue, 15 May 2012 16:08:24 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/1034 Tested-by: build bot (Jenkins) Reviewed-by: Steve Goodrich Reviewed-by: Stefan Reinauer --- src/mainboard/amd/persimmon/agesawrapper.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mainboard/amd/persimmon') 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; -- cgit v1.2.3