From e3aef13933c36f8a12687d554e952d360fde0bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 2 May 2014 09:40:04 +0300 Subject: AGESA fam15tn: Use common GetHeapBase() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implementation of this function is common for all boards in family, and also across different families. Change-Id: I562a132fa6d3ade2700d9a375d7aa21fcf8ea890 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5653 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/amd/parmer/agesawrapper.c | 19 ------------------- src/mainboard/amd/parmer/agesawrapper.h | 2 -- src/mainboard/amd/thatcher/agesawrapper.c | 19 ------------------- src/mainboard/amd/thatcher/agesawrapper.h | 2 -- src/mainboard/asus/f2a85-m/agesawrapper.c | 19 ------------------- src/mainboard/asus/f2a85-m/agesawrapper.h | 2 -- src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c | 19 ------------------- src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h | 2 -- 8 files changed, 84 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c index 827ce6d4ec..908e4b0cb5 100644 --- a/src/mainboard/amd/parmer/agesawrapper.c +++ b/src/mainboard/amd/parmer/agesawrapper.c @@ -41,8 +41,6 @@ #include "FchPlatform.h" #include "Fch.h" #include -#include -#include #include #include #include "hudson.h" @@ -248,23 +246,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; } -UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_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); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/amd/parmer/agesawrapper.h b/src/mainboard/amd/parmer/agesawrapper.h index 5007510bcf..579350f1db 100644 --- a/src/mainboard/amd/parmer/agesawrapper.h +++ b/src/mainboard/amd/parmer/agesawrapper.h @@ -92,6 +92,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID); -UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c index c50f3a042b..c8f25d6bb7 100644 --- a/src/mainboard/amd/thatcher/agesawrapper.c +++ b/src/mainboard/amd/thatcher/agesawrapper.c @@ -41,8 +41,6 @@ #include "FchPlatform.h" #include "Fch.h" #include -#include -#include #include #include #include "hudson.h" @@ -246,23 +244,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; } -UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_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); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/amd/thatcher/agesawrapper.h b/src/mainboard/amd/thatcher/agesawrapper.h index 5007510bcf..579350f1db 100644 --- a/src/mainboard/amd/thatcher/agesawrapper.h +++ b/src/mainboard/amd/thatcher/agesawrapper.h @@ -92,6 +92,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID); -UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c index 3b7b2635b5..02d27964c0 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.c +++ b/src/mainboard/asus/f2a85-m/agesawrapper.c @@ -26,9 +26,7 @@ #include "BiosCallOuts.h" #include "PlatformGnbPcieComplex.h" -#include #include -#include #include #include #include @@ -239,23 +237,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; } -UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_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); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.h b/src/mainboard/asus/f2a85-m/agesawrapper.h index 29eedaf707..71f0ff63bb 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.h +++ b/src/mainboard/asus/f2a85-m/agesawrapper.h @@ -91,6 +91,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID); -UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c index 2720f16743..b9519c6a3a 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c @@ -28,9 +28,7 @@ #define __SIMPLE_DEVICE__ -#include #include -#include #include #include #include @@ -230,23 +228,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; } -UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_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); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h index aa3cc2edcb..e5f028a845 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h @@ -91,6 +91,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID); -UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif -- cgit v1.2.3