diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-26 11:25:13 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-27 12:52:07 +0200 |
| commit | b1fcbf364f0d81b8d28755055ae9558af2f4b712 (patch) | |
| tree | 3cb520bf43ac71083ac8071891800c9097e18803 /src/southbridge/amd/agesa | |
| parent | f7284089e3657c66efeeb180a1f101a60d832901 (diff) | |
AGESA: Separate HeapManager declarations from BiosCallOuts
Change-Id: I168db92b10d5abc05be2dc374df3f892003d5255
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10317
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Diffstat (limited to 'src/southbridge/amd/agesa')
| -rw-r--r-- | src/southbridge/amd/agesa/hudson/agesawrapper.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/southbridge/amd/agesa/hudson/agesawrapper.c b/src/southbridge/amd/agesa/hudson/agesawrapper.c index a7e4289a19..b98d7b4c8d 100644 --- a/src/southbridge/amd/agesa/hudson/agesawrapper.c +++ b/src/southbridge/amd/agesa/hudson/agesawrapper.c @@ -41,13 +41,17 @@ extern UINT8 picr_data[0x54], intr_data[0x54]; +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) +#error Use of GetHeapBase() is incorrect or at least suspicious +#endif + AGESA_STATUS agesawrapper_fchs3earlyrestore (void) { FCH_DATA_BLOCK FchParams; AMD_CONFIG_PARAMS StdHeader; StdHeader.HeapStatus = HEAP_SYSTEM_MEM; - StdHeader.HeapBasePtr = GetHeapBase(&StdHeader) + 0x10; + StdHeader.HeapBasePtr = (uintptr_t) GetHeapBase() + 0x10; StdHeader.AltImageBasePtr = 0; StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout; StdHeader.Func = 0; @@ -67,7 +71,7 @@ AGESA_STATUS agesawrapper_fchs3laterestore (void) UINT8 byte; StdHeader.HeapStatus = HEAP_SYSTEM_MEM; - StdHeader.HeapBasePtr = GetHeapBase(&StdHeader) + 0x10; + StdHeader.HeapBasePtr = (uintptr_t) GetHeapBase() + 0x10; StdHeader.AltImageBasePtr = 0; StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout; StdHeader.Func = 0; |