From 3b4b069a0c8bf255c81a798c138b413f02415a5c Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 8 Sep 2017 07:37:06 +0300 Subject: AGESA binaryPI: Remove heapmanager from romstage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/21454 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/amd/agesa/Makefile.inc | 3 ++- src/cpu/amd/pi/Makefile.inc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/cpu') 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 -- cgit v1.2.3