2 files changed, 6 insertions, 78 deletions
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c
index 58a13f2f59..3a6e10917f 100644
--- a/src/mainboard/tyan/s8226/BiosCallOuts.c
+++ b/src/mainboard/tyan/s8226/BiosCallOuts.c
@@ -86,12 +86,12 @@ STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 	{AGESA_DO_RESET,			BiosReset },
 	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
 	{AGESA_READ_SPD,			BiosReadSpd },
-	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_READ_SPD_RECOVERY,		agesa_NoopUnsupported },
 	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
+	{AGESA_GET_IDS_INIT_DATA,		agesa_EmptyIdsInitData },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		agesa_NoopSuccess },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		agesa_NoopSuccess },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	agesa_NoopSuccess },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
@@ -115,60 +115,6 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 	return CalloutStatus;
 }
 
-
-CONST IDS_NV_ITEM IdsData[] =
-{
-	/*{
-	  AGESA_IDS_NV_MAIN_PLL_CON,
-	  0x1
-	  },
-	  {
-	  AGESA_IDS_NV_MAIN_PLL_FID_EN,
-	  0x1
-	  },
-	  {
-	  AGESA_IDS_NV_MAIN_PLL_FID,
-	  0x8
-	  },
-
-	  {
-	  AGESA_IDS_NV_CUSTOM_NB_PSTATE,
-	  },
-	  {
-	  AGESA_IDS_NV_CUSTOM_NB_P0_DIV_CTRL,
-	  },
-	  {
-	  AGESA_IDS_NV_CUSTOM_NB_P1_DIV_CTRL,
-	  },
-	  {
-	  AGESA_IDS_NV_FORCE_NB_PSTATE,
-	  },
-	 */
-	{
-		0xFFFF,
-		0xFFFF
-	}
-};
-
-#define   NUM_IDS_ENTRIES    (sizeof (IdsData) / sizeof (IDS_NV_ITEM))
-
-AGESA_STATUS BiosGetIdsInitData (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-	UINTN   i;
-	IDS_NV_ITEM *IdsPtr;
-
-	IdsPtr = ((IDS_CALLOUT_STRUCT *) ConfigPtr)->IdsNvPtr;
-
-	if (Data == IDS_CALLOUT_INIT) {
-		for (i = 0; i < NUM_IDS_ENTRIES; i++) {
-			IdsPtr[i].IdsNvValue = IdsData[i].IdsNvValue;
-			IdsPtr[i].IdsNvId = IdsData[i].IdsNvId;
-		}
-	}
-	return AGESA_SUCCESS;
-}
-
-
 AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
 	AGESA_STATUS Status;
@@ -189,22 +135,3 @@ AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 
 	return Status;
 }
-
-/*  Call the host environment interface to provide a user hook opportunity. */
-AGESA_STATUS BiosHookBeforeDQSTraining (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-	return AGESA_SUCCESS;
-}
-
-/*  Call the host environment interface to provide a user hook opportunity. */
-AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-	return AGESA_SUCCESS;
-}
-
-/*  Call the host environment interface to provide a user hook opportunity. */
-AGESA_STATUS BiosHookBeforeExitSelfRefresh (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-	return AGESA_SUCCESS;
-}
-
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.h b/src/mainboard/tyan/s8226/BiosCallOuts.h
index 0b4fb5769c..f733c3f727 100644
--- a/src/mainboard/tyan/s8226/BiosCallOuts.h
+++ b/src/mainboard/tyan/s8226/BiosCallOuts.h
@@ -20,6 +20,7 @@
 #ifndef _BIOS_CALLOUT_H_
 #define _BIOS_CALLOUT_H_
 
+#include <northbridge/amd/agesa/def_callouts.h>
 #include <northbridge/amd/agesa/family15/fam15_callouts.h>
 
 /* CALLOUT Initialization */