4 files changed, 4 insertions, 40 deletions
diff --git a/src/drivers/amd/agesa/Makefile.inc b/src/drivers/amd/agesa/Makefile.inc
index 4d5bd3e368..fb46d91991 100644
--- a/src/drivers/amd/agesa/Makefile.inc
+++ b/src/drivers/amd/agesa/Makefile.inc
@@ -13,8 +13,6 @@
 
 ifeq ($(CONFIG_DRIVERS_AMD_PI),y)
 
-ifneq ($(CONFIG_BINARYPI_LEGACY_WRAPPER),y)
-
 romstage-y += romstage.c
 romstage-y += mtrr_fixme.c
 romstage-y += state_machine.c
@@ -24,12 +22,6 @@ ramstage-y += state_machine.c
 cpu_incs-y += $(src)/drivers/amd/agesa/cache_as_ram.S
 postcar-y += cache_as_ram.S
 
-else
-
-romstage-y += heapmanager.c
-
-endif
-
 romstage-y += def_callouts.c
 romstage-y += eventlog.c
 
diff --git a/src/drivers/amd/agesa/def_callouts.c b/src/drivers/amd/agesa/def_callouts.c
index 2e75220e4c..4b78d633c9 100644
--- a/src/drivers/amd/agesa/def_callouts.c
+++ b/src/drivers/amd/agesa/def_callouts.c
@@ -35,7 +35,7 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINTN Data, VOID *ConfigPtr)
 	AGESA_STATUS status;
 	UINTN i;
 
-	if (HAS_LEGACY_WRAPPER || ENV_RAMSTAGE) {
+	if (ENV_RAMSTAGE) {
 		/* One HeapManager serves them all. */
 		status = HeapManagerCallout(Func, Data, ConfigPtr);
 		if (status != AGESA_UNSUPPORTED)
@@ -43,7 +43,7 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINTN Data, VOID *ConfigPtr)
 	}
 
 #if HAS_AGESA_FCH_OEM_CALLOUT
-	if (!HAS_LEGACY_WRAPPER && Func == AGESA_FCH_OEM_CALLOUT) {
+	if (Func == AGESA_FCH_OEM_CALLOUT) {
 		agesa_fch_oem_config(Data, ConfigPtr);
 		return AGESA_SUCCESS;
 	}
@@ -120,24 +120,12 @@ AGESA_STATUS agesa_RunFuncOnAp (UINT32 Func, UINTN Data, VOID *ConfigPtr)
 	AP_EXE_PARAMS ApExeParams;
 
 	memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS));
-
-	if (HAS_LEGACY_WRAPPER) {
-		ApExeParams.StdHeader.AltImageBasePtr = 0;
-		ApExeParams.StdHeader.CalloutPtr = &GetBiosCallout;
-		ApExeParams.StdHeader.Func = 0;
-		ApExeParams.StdHeader.ImageBasePtr = 0;
-	} else {
-		memcpy(&ApExeParams.StdHeader, StdHeader, sizeof(*StdHeader));
-	}
+	memcpy(&ApExeParams.StdHeader, StdHeader, sizeof(*StdHeader));
 
 	ApExeParams.FunctionNumber = Func;
 	ApExeParams.RelatedDataBlock = ConfigPtr;
 
-#if HAS_LEGACY_WRAPPER
-	status = AmdLateRunApTask(&ApExeParams);
-#else
 	status = module_dispatch(AMD_LATE_RUN_AP_TASK, &ApExeParams.StdHeader);
-#endif
 
 	ASSERT(status == AGESA_SUCCESS);
 	return status;
diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c
index df2c73c26d..aa0ea9b930 100644
--- a/src/drivers/amd/agesa/eventlog.c
+++ b/src/drivers/amd/agesa/eventlog.c
@@ -180,11 +180,7 @@ static void amd_flush_eventlog(EVENT_PARAMS *Event)
 
 	do {
 		AGESA_STATUS status;
-#if HAS_LEGACY_WRAPPER
-		status = AmdReadEventLog(Event);
-#else
 		status = module_dispatch(AMD_READ_EVENT_LOG, &Event->StdHeader);
-#endif
 		if (status != AGESA_SUCCESS)
 			return;
 		if (Event->EventClass == 0)
@@ -203,16 +199,7 @@ void agesawrapper_trace(AGESA_STATUS ret, AMD_CONFIG_PARAMS *StdHeader,
 		return;
 
 	memset(&AmdEventParams, 0, sizeof(EVENT_PARAMS));
-
-	if (HAS_LEGACY_WRAPPER) {
-		AmdEventParams.StdHeader.AltImageBasePtr = 0;
-		AmdEventParams.StdHeader.CalloutPtr = &GetBiosCallout;
-		AmdEventParams.StdHeader.Func = 0;
-		AmdEventParams.StdHeader.ImageBasePtr = 0;
-		AmdEventParams.StdHeader.HeapStatus = StdHeader->HeapStatus;
-	} else {
-		memcpy(&AmdEventParams.StdHeader, StdHeader, sizeof(*StdHeader));
-	}
+	memcpy(&AmdEventParams.StdHeader, StdHeader, sizeof(*StdHeader));
 
 	amd_flush_eventlog(&AmdEventParams);
 }
diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c
index 76a6ea4500..72aac3eedd 100644
--- a/src/drivers/amd/agesa/romstage.c
+++ b/src/drivers/amd/agesa/romstage.c
@@ -30,9 +30,6 @@
 #if !CONFIG(POSTCAR_STAGE)
 #error "Only POSTCAR_STAGE is supported."
 #endif
-#if HAS_LEGACY_WRAPPER
-#error "LEGACY_WRAPPER code not supported"
-#endif
 
 void asmlinkage early_all_cores(void)
 {