binaryPI: Drop BINARYPI_LEGACY_WRAPPER support

Drop all the sources that were guarded with this.

Change-Id: I6c6fd19875cb57f0caf42a1a94f59efed83bfe0d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/19275
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>

9 files changed, 0 insertions, 481 deletions

diff --git a/src/northbridge/amd/agesa/state_machine.h b/src/northbridge/amd/agesa/state_machine.h
index 7d9fe9c5ef..02a7a41edc 100644
--- a/src/northbridge/amd/agesa/state_machine.h
+++ b/src/northbridge/amd/agesa/state_machine.h
@@ -20,8 +20,6 @@
 #include <AGESA.h>
 #include <AMD.h>
 
-#define HAS_LEGACY_WRAPPER CONFIG(BINARYPI_LEGACY_WRAPPER)
-
 /* eventlog */
 void agesawrapper_trace(AGESA_STATUS ret, AMD_CONFIG_PARAMS *StdHeader, const char *func);
 AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus);
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 6bb121707e..6afea7c890 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -34,10 +34,6 @@
 #include <arch/acpigen.h>
 #include <northbridge/amd/pi/nb_common.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-#include <northbridge/amd/pi/agesawrapper.h>
-#include <northbridge/amd/pi/agesawrapper_call.h>
-#endif
 
 #define MAX_NODE_NUMS MAX_NODES
 
@@ -608,16 +604,6 @@ static void domain_read_resources(struct device *dev)
 
 static void domain_enable_resources(struct device *dev)
 {
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-	/* Must be called after PCI enumeration and resource allocation */
-	if (!acpi_is_wakeup_s3()) {
-		/* Enable MMIO on AMD CPU Address Map Controller */
-		amd_initcpuio();
-
-		agesawrapper_amdinitmid();
-	}
-	printk(BIOS_DEBUG, "  ader - leaving %s.\n", __func__);
-#endif
 }
 
 #if CONFIG_HW_MEM_HOLE_SIZEK != 0
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index 723e6f474d..c26f5aeed2 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -34,10 +34,6 @@
 #include <arch/acpigen.h>
 #include <northbridge/amd/pi/nb_common.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-#include <northbridge/amd/pi/agesawrapper.h>
-#include <northbridge/amd/pi/agesawrapper_call.h>
-#endif
 
 #define MAX_NODE_NUMS MAX_NODES
 
@@ -609,13 +605,6 @@ static void domain_read_resources(struct device *dev)
 
 static void domain_enable_resources(struct device *dev)
 {
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-	/* Must be called after PCI enumeration and resource allocation */
-	if (!acpi_is_wakeup_s3())
-		AGESAWRAPPER(amdinitmid);
-
-	printk(BIOS_DEBUG, "  ader - leaving domain_enable_resources.\n");
-#endif
 }
 
 #if CONFIG_HW_MEM_HOLE_SIZEK != 0
diff --git a/src/northbridge/amd/pi/00730F01/Makefile.inc b/src/northbridge/amd/pi/00730F01/Makefile.inc
index 94cf72e5ad..33f2b79940 100644
--- a/src/northbridge/amd/pi/00730F01/Makefile.inc
+++ b/src/northbridge/amd/pi/00730F01/Makefile.inc
@@ -18,7 +18,5 @@ romstage-y += dimmSpd.c
 ramstage-y += northbridge.c
 ramstage-y += iommu.c
 
-ifneq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y)
 romstage-y += state_machine.c
 ramstage-y += state_machine.c
-endif
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 3d7b883d17..acb20e6c63 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -36,10 +36,6 @@
 #include <arch/acpigen.h>
 #include <northbridge/amd/pi/nb_common.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-#include <northbridge/amd/pi/agesawrapper.h>
-#include <northbridge/amd/pi/agesawrapper_call.h>
-#endif
 
 #define MAX_NODE_NUMS MAX_NODES
 
@@ -835,13 +831,6 @@ static void domain_read_resources(struct device *dev)
 
 static void domain_enable_resources(struct device *dev)
 {
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-	/* Must be called after PCI enumeration and resource allocation */
-	if (!acpi_is_wakeup_s3())
-		AGESAWRAPPER(amdinitmid);
-
-	printk(BIOS_DEBUG, "  ader - leaving domain_enable_resources.\n");
-#endif
 }
 
 #if CONFIG_HW_MEM_HOLE_SIZEK != 0
diff --git a/src/northbridge/amd/pi/Makefile.inc b/src/northbridge/amd/pi/Makefile.inc
index c2c8d8818d..ffafc6038f 100644
--- a/src/northbridge/amd/pi/Makefile.inc
+++ b/src/northbridge/amd/pi/Makefile.inc
@@ -19,11 +19,6 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) += 00630F01
 subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI_00730F01) += 00730F01
 subdirs-$(CONFIG_NORTHBRIDGE_AMD_PI_00660F01) += 00660F01
 
-ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y)
-romstage-y += agesawrapper.c
-ramstage-y += agesawrapper.c
-endif
-
 romstage-y += ramtop.c
 postcar-y += ramtop.c
 ramstage-y += ramtop.c
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c
deleted file mode 100644
index e3bfd90fd8..0000000000
--- a/src/northbridge/amd/pi/agesawrapper.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 - 2014 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <AGESA.h>
-#include <cbfs.h>
-#include <cbmem.h>
-#include <delay.h>
-#include <console/console.h>
-#include <cpu/x86/mtrr.h>
-#include <FchPlatform.h>
-#include <heapManager.h>
-#include <northbridge/amd/agesa/agesa_helper.h>
-#include <northbridge/amd/agesa/state_machine.h>
-#include <northbridge/amd/pi/agesawrapper.h>
-#include <northbridge/amd/agesa/BiosCallOuts.h>
-
-void __weak OemPostParams(AMD_POST_PARAMS *PostParams) {}
-
-#define FILECODE UNASSIGNED_FILE_FILECODE
-
-AGESA_STATUS agesawrapper_amdinitreset(void)
-{
-	AGESA_STATUS status;
-	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_RESET_PARAMS AmdResetParams;
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	LibAmdMemFill (&AmdResetParams,
-		       0,
-		       sizeof(AMD_RESET_PARAMS),
-		       &(AmdResetParams.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_RESET;
-	AmdParamStruct.AllocationMethod = ByHost;
-	AmdParamStruct.NewStructSize = sizeof(AMD_RESET_PARAMS);
-	AmdParamStruct.NewStructPtr = &AmdResetParams;
-	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-	AmdCreateStruct (&AmdParamStruct);
-
-	AmdResetParams.FchInterface.Xhci0Enable = CONFIG(HUDSON_XHCI_ENABLE);
-	if (CONFIG(SOUTHBRIDGE_AMD_PI_BOLTON))
-		AmdResetParams.FchInterface.Xhci1Enable = TRUE;
-
-	AmdResetParams.FchInterface.SataEnable = !((CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3));
-	AmdResetParams.FchInterface.IdeEnable = (CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3);
-
-	status = AmdInitReset(&AmdResetParams);
-	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
-	AmdReleaseStruct (&AmdParamStruct);
-	return status;
-}
-
-AGESA_STATUS agesawrapper_amdinitearly(void)
-{
-	AGESA_STATUS status;
-	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_EARLY_PARAMS     *AmdEarlyParamsPtr;
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_EARLY;
-	AmdParamStruct.AllocationMethod = PreMemHeap;
-	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-	AmdCreateStruct (&AmdParamStruct);
-
-	AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;
-	OemCustomizeInitEarly (AmdEarlyParamsPtr);
-
-	AmdEarlyParamsPtr->GnbConfig.PsppPolicy = PsppDisabled;
-	status = AmdInitEarly ((AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr);
-	/*
-	 * init_timer() needs to be called on CZ PI, because AGESA resets the LAPIC reload value
-	 * on the AMD_INIT_EARLY call
-	 */
-	if (CONFIG(CPU_AMD_PI_00660F01))
-		init_timer();
-	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
-	AmdReleaseStruct (&AmdParamStruct);
-
-	return status;
-}
-
-AGESA_STATUS agesawrapper_amdinitpost(void)
-{
-	AGESA_STATUS status;
-	AMD_INTERFACE_PARAMS  AmdParamStruct;
-	AMD_POST_PARAMS       *PostParams;
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_POST;
-	AmdParamStruct.AllocationMethod = PreMemHeap;
-	AmdParamStruct.StdHeader.AltImageBasePtr = NULL;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-
-	AmdCreateStruct (&AmdParamStruct);
-	PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;
-
-	PostParams->MemConfig.UmaMode = CONFIG(GFXUMA) ? UMA_AUTO : UMA_NONE;
-	PostParams->MemConfig.UmaSize = 0;
-	PostParams->MemConfig.BottomIo = (UINT16)
-					 (CONFIG_BOTTOMIO_POSITION >> 24);
-
-	OemPostParams(PostParams);
-
-	status = AmdInitPost (PostParams);
-
-	/* If UMA is enabled we currently have it below TOP_MEM as well.
-	 * UMA may or may not be cacheable, so Sub4GCacheTop could be
-	 * higher than UmaBase. With UMA_NONE we see UmaBase==0. */
-	if (PostParams->MemConfig.UmaBase)
-		backup_top_of_low_cacheable(PostParams->MemConfig.UmaBase << 16);
-	else
-		backup_top_of_low_cacheable(PostParams->MemConfig.Sub4GCacheTop);
-
-	printk(
-			BIOS_SPEW,
-			"setup_uma_memory: umamode %s\n",
-			(PostParams->MemConfig.UmaMode == UMA_AUTO) ? "UMA_AUTO" :
-			(PostParams->MemConfig.UmaMode == UMA_SPECIFIED) ? "UMA_SPECIFIED" :
-			(PostParams->MemConfig.UmaMode == UMA_NONE) ? "UMA_NONE" :
-			"unknown"
-	);
-	printk(
-			BIOS_SPEW,
-			"setup_uma_memory: syslimit 0x%08llX, bottomio 0x%08lx\n",
-			(unsigned long long)(PostParams->MemConfig.SysLimit) << 16,
-			(unsigned long)(PostParams->MemConfig.BottomIo) << 16
-	);
-	printk(
-			BIOS_SPEW,
-			"setup_uma_memory: uma size %luMB, uma start 0x%08lx\n",
-			(unsigned long)(PostParams->MemConfig.UmaSize) >> (20 - 16),
-			(unsigned long)(PostParams->MemConfig.UmaBase) << 16
-	);
-	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(PostParams->StdHeader.HeapStatus);
-	AmdReleaseStruct (&AmdParamStruct);
-
-	return status;
-}
-
-AGESA_STATUS agesawrapper_amdinitenv(void)
-{
-	AGESA_STATUS status;
-	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_ENV_PARAMS       *EnvParam;
-
-	/* Initialize heap space */
-	EmptyHeap();
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_ENV;
-	AmdParamStruct.AllocationMethod = PostMemDram;
-	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-	status = AmdCreateStruct (&AmdParamStruct);
-	EnvParam = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;
-
-	EnvParam->FchInterface.AzaliaController = AzEnable;
-	EnvParam->FchInterface.SataClass = CONFIG_HUDSON_SATA_MODE;
-	EnvParam->FchInterface.SataEnable = !((CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3));
-	EnvParam->FchInterface.IdeEnable = (CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3);
-	EnvParam->FchInterface.SataIdeMode = (CONFIG_HUDSON_SATA_MODE == 3);
-
-	status = AmdInitEnv (EnvParam);
-	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(EnvParam->StdHeader.HeapStatus);
-	/* Initialize Subordinate Bus Number and Secondary Bus Number
-	 * In platform BIOS this address is allocated by PCI enumeration code
-	 Modify D1F0x18
-	*/
-
-	return status;
-}
-
-AGESA_STATUS agesawrapper_amdinitmid(void)
-{
-	AGESA_STATUS status;
-	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_MID_PARAMS *MidParam;
-
-	/* Enable MMIO on AMD CPU Address Map Controller */
-	amd_initcpuio ();
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_MID;
-	AmdParamStruct.AllocationMethod = PostMemDram;
-	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-
-	AmdCreateStruct (&AmdParamStruct);
-	MidParam = (AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr;
-
-	MidParam->GnbMidConfiguration.iGpuVgaMode = 0;/* 0 iGpuVgaAdapter, 1 iGpuVgaNonAdapter; */
-	MidParam->GnbMidConfiguration.GnbIoapicAddress = 0xFEC20000;
-
-	MidParam->FchInterface.AzaliaController = AzEnable;
-	MidParam->FchInterface.SataClass = CONFIG_HUDSON_SATA_MODE;
-	MidParam->FchInterface.SataEnable = !((CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3));
-	MidParam->FchInterface.IdeEnable = (CONFIG_HUDSON_SATA_MODE == 0) || (CONFIG_HUDSON_SATA_MODE == 3);
-	MidParam->FchInterface.SataIdeMode = (CONFIG_HUDSON_SATA_MODE == 3);
-
-	status = AmdInitMid ((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);
-	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
-	AmdReleaseStruct (&AmdParamStruct);
-
-	return status;
-}
-
-AGESA_STATUS agesawrapper_amdinitlate(void)
-{
-	AGESA_STATUS Status;
-	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_LATE_PARAMS *AmdLateParams;
-
-	if (!ENV_RAMSTAGE)
-		return AGESA_UNSUPPORTED;
-
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof(AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
-
-	AmdParamStruct.AgesaFunctionName = AMD_INIT_LATE;
-	AmdParamStruct.AllocationMethod = PostMemDram;
-	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
-	AmdParamStruct.StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
-	AmdParamStruct.StdHeader.Func = 0;
-	AmdParamStruct.StdHeader.ImageBasePtr = 0;
-
-	/* NOTE: if not call amdcreatestruct, the initializer(AmdInitLateInitializer) would not be called */
-	AmdCreateStruct(&AmdParamStruct);
-	AmdLateParams = (AMD_LATE_PARAMS *)AmdParamStruct.NewStructPtr;
-	AmdLateParams->GnbLateConfiguration.GnbIoapicId = CONFIG_MAX_CPUS + 1;
-	AmdLateParams->GnbLateConfiguration.FchIoapicId = CONFIG_MAX_CPUS;
-	/* Code for creating CDIT requires hop count table. If it is not
-	 * present AGESA_ERROR is returned, which confuses users. CDIT is not
-	 * written to the ACPI tables anyway. */
-	AmdLateParams->PlatformConfig.UserOptionCdit = 0;
-
-	Status = AmdInitLate(AmdLateParams);
-	if (Status != AGESA_SUCCESS) {
-		agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);
-		ASSERT(Status == AGESA_SUCCESS);
-	}
-
-	agesawrapper_setlateinitptr(AmdLateParams);
-
-	/* No AmdReleaseStruct(&AmdParamStruct), we need AmdLateParams later. */
-	return Status;
-}
-
-const void *agesawrapper_locate_module (const CHAR8 name[8])
-{
-	const void *agesa;
-	const AMD_IMAGE_HEADER* image;
-	const AMD_MODULE_HEADER* module;
-	size_t file_size;
-
-	if (CONFIG(VBOOT)) {
-		/* Use phys. location in flash and prevent vboot from searching cbmem */
-		agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION;
-		file_size = 0x100000;
-	} else {
-		agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME,
-					CBFS_TYPE_RAW, &file_size);
-	}
-
-	if (!agesa)
-		return NULL;
-	image =  LibAmdLocateImage(agesa, agesa + file_size - 1, 4096, name);
-	module = (AMD_MODULE_HEADER*)image->ModuleInfoOffset;
-
-	return module;
-}
diff --git a/src/northbridge/amd/pi/agesawrapper.h b/src/northbridge/amd/pi/agesawrapper.h
deleted file mode 100644
index e1cec43c32..0000000000
--- a/src/northbridge/amd/pi/agesawrapper.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _AGESAWRAPPER_H_
-#define _AGESAWRAPPER_H_
-
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-
-#include <stdint.h>
-#include <Porting.h>
-#include <AGESA.h>
-
-AGESA_STATUS agesawrapper_amdinitreset(void);
-AGESA_STATUS agesawrapper_amdinitearly(void);
-AGESA_STATUS agesawrapper_amdinitenv(void);
-AGESA_STATUS agesawrapper_amdinitlate(void);
-AGESA_STATUS agesawrapper_amdinitpost(void);
-AGESA_STATUS agesawrapper_amdinitmid(void);
-
-AGESA_STATUS agesawrapper_amdinitresume(void);
-AGESA_STATUS agesawrapper_amdS3Save(void);
-AGESA_STATUS agesawrapper_amds3laterestore(void);
-
-AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
-AGESA_STATUS agesawrapper_fchs3laterestore(void);
-
-#define AGESA_EVENTLOG(status, stdheader) \
-	agesawrapper_trace(status, stdheader, __func__)
-
-#else
-
-/* Defined to make unused agesa_main() build. */
-static inline int agesawrapper_amdinitreset(void) { return -1; }
-static inline int agesawrapper_amdinitearly(void) { return -1; }
-static inline int agesawrapper_amdinitenv(void) { return -1; }
-static inline int agesawrapper_amdinitpost(void) { return -1; }
-static inline int agesawrapper_amdinitresume(void) { return -1; }
-static inline int agesawrapper_amds3laterestore(void) { return -1; }
-
-#endif
-
-#if CONFIG(BINARYPI_LEGACY_WRAPPER)
-const void *agesawrapper_locate_module (const CHAR8 name[8]);
-
-VOID OemCustomizeInitEarly (IN OUT AMD_EARLY_PARAMS *InitEarly);
-void OemPostParams(AMD_POST_PARAMS *PostParams);
-#endif
-
-#endif /* _AGESAWRAPPER_H_ */
diff --git a/src/northbridge/amd/pi/agesawrapper_call.h b/src/northbridge/amd/pi/agesawrapper_call.h
deleted file mode 100644
index b235b49939..0000000000
--- a/src/northbridge/amd/pi/agesawrapper_call.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _AGESAWRAPPER_CALL_H_
-#define _AGESAWRAPPER_CALL_H_
-
-#include <stdint.h>
-#include <console/console.h>
-#include <AGESA.h>
-
-/*
- * Possible AGESA_STATUS values:
- *
- * 0x0 = AGESA_SUCCESS
- * 0x1 = AGESA_UNSUPPORTED
- * 0x2 = AGESA_BOUNDS_CHK
- * 0x3 = AGESA_ALERT
- * 0x4 = AGESA_WARNING
- * 0x5 = AGESA_ERROR
- * 0x6 = AGESA_CRITICAL
- * 0x7 = AGESA_FATAL
- */
-static const char *decodeAGESA_STATUS(AGESA_STATUS sret)
-{
-	const char *statusStrings[] = { "AGESA_SUCCESS", "AGESA_UNSUPPORTED",
-					"AGESA_BOUNDS_CHK", "AGESA_ALERT",
-					"AGESA_WARNING", "AGESA_ERROR",
-					"AGESA_CRITICAL", "AGESA_FATAL"
-					};
-	if (sret > 7) return "unknown"; /* Non-AGESA error code */
-	return statusStrings[sret];
-}
-
-static inline u32 do_agesawrapper(AGESA_STATUS (*func)(void), const char *name)
-{
-	AGESA_STATUS ret;
-	printk(BIOS_DEBUG, "agesawrapper_%s() entry\n", name);
-	ret = func();
-	printk(BIOS_DEBUG, "agesawrapper_%s() returned %s\n",
-			name, decodeAGESA_STATUS(ret));
-	return (u32)ret;
-}
-
-#define AGESAWRAPPER(func) do_agesawrapper(agesawrapper_ ## func, #func)
-
-#define AGESAWRAPPER_PRE_CONSOLE(func) agesawrapper_ ## func()
-
-#endif