diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-09-08 07:37:06 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-09-10 03:23:32 +0000 |
| commit | 3b4b069a0c8bf255c81a798c138b413f02415a5c (patch) | |
| tree | 0cec271bfc5d2c86f2f086baa77610372eb01e9c /src | |
| parent | f51c5fd655a5bc04b3ab39ca15c145d49f1007be (diff) | |
AGESA binaryPI: Remove heapmanager from romstage
With AMD_INIT_ENV and AMD_INIT_S3LATERESTORE moved
from romstage to ramstage, heapamanager in romstage
is no longer needed.
Change-Id: Iea8ad3ddb245c83dd290436ac9d4ecac9350b88c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21454
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/amd/agesa/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/def_callouts.c | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/cpu/amd/agesa/Makefile.inc b/src/cpu/amd/agesa/Makefile.inc index 2a34ee041f..c8e125e445 100644 --- a/src/cpu/amd/agesa/Makefile.inc +++ b/src/cpu/amd/agesa/Makefile.inc @@ -27,7 +27,8 @@ cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.S romstage-y += romstage.c endif -romstage-y += heapmanager.c +romstage-$(CONFIG_AGESA_LEGACY_WRAPPER) += heapmanager.c + ramstage-y += heapmanager.c ramstage-$(CONFIG_AGESA_LEGACY_WRAPPER) += amd_late_init.c diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc index af24b48001..df79c82d61 100644 --- a/src/cpu/amd/pi/Makefile.inc +++ b/src/cpu/amd/pi/Makefile.inc @@ -22,9 +22,9 @@ cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.S ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y) romstage-y += romstage.c ramstage-y += amd_late_init.c +romstage-y += ../agesa/heapmanager.c else romstage-y += ../agesa/romstage.c endif -romstage-y += ../agesa/heapmanager.c ramstage-y += ../agesa/heapmanager.c diff --git a/src/northbridge/amd/agesa/def_callouts.c b/src/northbridge/amd/agesa/def_callouts.c index d5e8ba5315..e0999266f4 100644 --- a/src/northbridge/amd/agesa/def_callouts.c +++ b/src/northbridge/amd/agesa/def_callouts.c @@ -37,10 +37,12 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINTN Data, VOID *ConfigPtr) AGESA_STATUS status; UINTN i; - /* One HeapManager serves them all. */ - status = HeapManagerCallout(Func, Data, ConfigPtr); - if (status != AGESA_UNSUPPORTED) - return status; + if (HAS_LEGACY_WRAPPER || ENV_RAMSTAGE) { + /* One HeapManager serves them all. */ + status = HeapManagerCallout(Func, Data, ConfigPtr); + if (status != AGESA_UNSUPPORTED) + return status; + } #if HAS_AGESA_FCH_OEM_CALLOUT if (!HAS_LEGACY_WRAPPER && Func == AGESA_FCH_OEM_CALLOUT) { |