GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2017-09-08 07:37:06 +03:00
parent f51c5fd655
commit 3b4b069a0c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/amd/agesa/Makefile.inc
View File

@ -27,7 +27,8 @@ cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.S
romstage-y += romstage.c romstage-y += romstage.c
endif endif
romstage-y += heapmanager.c romstage-$(CONFIG_AGESA_LEGACY_WRAPPER) += heapmanager.c
ramstage-y += heapmanager.c ramstage-y += heapmanager.c
ramstage-$(CONFIG_AGESA_LEGACY_WRAPPER) += amd_late_init.c ramstage-$(CONFIG_AGESA_LEGACY_WRAPPER) += amd_late_init.c

2
src/cpu/amd/pi/Makefile.inc
View File

@ -22,9 +22,9 @@ cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.S
ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y) ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y)
romstage-y += romstage.c romstage-y += romstage.c
ramstage-y += amd_late_init.c ramstage-y += amd_late_init.c
romstage-y += ../agesa/heapmanager.c
else else
romstage-y += ../agesa/romstage.c romstage-y += ../agesa/romstage.c
endif endif
romstage-y += ../agesa/heapmanager.c
ramstage-y += ../agesa/heapmanager.c ramstage-y += ../agesa/heapmanager.c

10
src/northbridge/amd/agesa/def_callouts.c
View File

@ -37,10 +37,12 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINTN Data, VOID *ConfigPtr)
AGESA_STATUS status; AGESA_STATUS status;
UINTN i; UINTN i;
/* One HeapManager serves them all. */ if (HAS_LEGACY_WRAPPER || ENV_RAMSTAGE) {
status = HeapManagerCallout(Func, Data, ConfigPtr); /* One HeapManager serves them all. */
if (status != AGESA_UNSUPPORTED) status = HeapManagerCallout(Func, Data, ConfigPtr);
return status; if (status != AGESA_UNSUPPORTED)
return status;
}
#if HAS_AGESA_FCH_OEM_CALLOUT #if HAS_AGESA_FCH_OEM_CALLOUT
if (!HAS_LEGACY_WRAPPER && Func == AGESA_FCH_OEM_CALLOUT) { if (!HAS_LEGACY_WRAPPER && Func == AGESA_FCH_OEM_CALLOUT) {