diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c
index 47bf9623c3..c7b9409151 100644
--- a/src/mainboard/amd/dinar/BiosCallOuts.c
+++ b/src/mainboard/amd/dinar/BiosCallOuts.c
@@ -88,57 +88,19 @@ static void restore_socket(void)
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-		BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-		BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-		BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-		BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-		BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-		BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-		BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-		BiosGnbPcieSlotReset
-	},
-
-	{AGESA_GET_IDS_INIT_DATA,
-		BiosGetIdsInitData
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-		BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-		BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-		BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-		BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer},
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c
index b3a73f4fb4..cd80e5d7d8 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.c
+++ b/src/mainboard/amd/inagua/BiosCallOuts.c
@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-		BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-		BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-		BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-		BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-		BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-		BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-		BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-		BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-		BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-		BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-		BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-		BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c
index 6395484b94..a771a6cf14 100644
--- a/src/mainboard/amd/persimmon/BiosCallOuts.c
+++ b/src/mainboard/amd/persimmon/BiosCallOuts.c
@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-	 BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-	 BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-	 BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-	 BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-	 BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-	 BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-	 BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-	 BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-	 BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-	 BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-	 BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-	 BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c
index 5ca88540c9..00a0f58f8d 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.c
+++ b/src/mainboard/amd/south_station/BiosCallOuts.c
@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
-   BiosAllocateBuffer
-  },
-
-  {AGESA_DEALLOCATE_BUFFER,
-   BiosDeallocateBuffer
-  },
-
-  {AGESA_DO_RESET,
-   BiosReset
-  },
-
-  {AGESA_LOCATE_BUFFER,
-   BiosLocateBuffer
-  },
-
-  {AGESA_READ_SPD,
-   BiosReadSpd
-  },
-
-  {AGESA_READ_SPD_RECOVERY,
-   BiosDefaultRet
-  },
-
-  {AGESA_RUNFUNC_ONAP,
-   BiosRunFuncOnAp
-  },
-
-  {AGESA_GNB_PCIE_SLOT_RESET,
-   BiosGnbPcieSlotReset
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT,
-   BiosHookBeforeDramInit
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-   BiosHookBeforeDramInitRecovery
-  },
-
-  {AGESA_HOOKBEFORE_DQS_TRAINING,
-   BiosHookBeforeDQSTraining
-  },
-
-  {AGESA_HOOKBEFORE_EXIT_SELF_REF,
-   BiosHookBeforeExitSelfRefresh
-  },
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c
index a52b8bca19..a275dc8cbf 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.c
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.c
@@ -39,57 +39,19 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
-   BiosAllocateBuffer
-  },
-
-  {AGESA_DEALLOCATE_BUFFER,
-   BiosDeallocateBuffer
-  },
-
-  {AGESA_DO_RESET,
-   BiosReset
-  },
-
-  {AGESA_LOCATE_BUFFER,
-   BiosLocateBuffer
-  },
-
-  {AGESA_READ_SPD,
-   BiosReadSpd
-  },
-
-  {AGESA_READ_SPD_RECOVERY,
-   BiosDefaultRet
-  },
-
-  {AGESA_RUNFUNC_ONAP,
-   BiosRunFuncOnAp
-  },
-
-  {AGESA_GNB_PCIE_SLOT_RESET,
-   BiosGnbPcieSlotReset
-  },
-
-  {AGESA_GET_IDS_INIT_DATA,
-   BiosGetIdsInitData
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT,
-   BiosHookBeforeDramInit
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-   BiosHookBeforeDramInitRecovery
-  },
-
-  {AGESA_HOOKBEFORE_DQS_TRAINING,
-   BiosHookBeforeDQSTraining
-  },
-
-  {AGESA_HOOKBEFORE_EXIT_SELF_REF,
-   BiosHookBeforeExitSelfRefresh
-  },
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c
index 5ca88540c9..00a0f58f8d 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.c
+++ b/src/mainboard/amd/union_station/BiosCallOuts.c
@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
-   BiosAllocateBuffer
-  },
-
-  {AGESA_DEALLOCATE_BUFFER,
-   BiosDeallocateBuffer
-  },
-
-  {AGESA_DO_RESET,
-   BiosReset
-  },
-
-  {AGESA_LOCATE_BUFFER,
-   BiosLocateBuffer
-  },
-
-  {AGESA_READ_SPD,
-   BiosReadSpd
-  },
-
-  {AGESA_READ_SPD_RECOVERY,
-   BiosDefaultRet
-  },
-
-  {AGESA_RUNFUNC_ONAP,
-   BiosRunFuncOnAp
-  },
-
-  {AGESA_GNB_PCIE_SLOT_RESET,
-   BiosGnbPcieSlotReset
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT,
-   BiosHookBeforeDramInit
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-   BiosHookBeforeDramInitRecovery
-  },
-
-  {AGESA_HOOKBEFORE_DQS_TRAINING,
-   BiosHookBeforeDQSTraining
-  },
-
-  {AGESA_HOOKBEFORE_EXIT_SELF_REF,
-   BiosHookBeforeExitSelfRefresh
-  },
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c
index 3e0a6fb97f..e58aecd831 100644
--- a/src/mainboard/asrock/e350m1/BiosCallOuts.c
+++ b/src/mainboard/asrock/e350m1/BiosCallOuts.c
@@ -26,47 +26,17 @@
 
 CONST BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
-   BiosAllocateBuffer
-  },
-
-  {AGESA_DEALLOCATE_BUFFER,
-   BiosDeallocateBuffer
-  },
-
-  {AGESA_DO_RESET,
-   BiosReset
-  },
-
-  {AGESA_LOCATE_BUFFER,
-   BiosLocateBuffer
-  },
-
-  {AGESA_READ_SPD,
-   BiosReadSpd
-  },
-
-  {AGESA_READ_SPD_RECOVERY,
-   BiosDefaultRet
-  },
-
-  {AGESA_RUNFUNC_ONAP,
-   BiosRunFuncOnAp
-  },
-
-  {AGESA_HOOKBEFORE_DQS_TRAINING,
-   BiosHookBeforeDQSTraining
-  },
-
-  {AGESA_HOOKBEFORE_DRAM_INIT,
-   BiosHookBeforeDramInit
-  },
-  {AGESA_HOOKBEFORE_EXIT_SELF_REF,
-   BiosHookBeforeExitSelfRefresh
-  },
-  {AGESA_GNB_PCIE_SLOT_RESET,
-   BiosGnbPcieSlotReset
-  },
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
index 51fcee689b..8c0855e961 100755
--- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
@@ -33,53 +33,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-	 BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-	 BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-	 BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-	 BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-	 BiosReadSpd_from_cbfs
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-	 BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-	 BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-	 BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-	 BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-	 BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-	 BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-	 BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd_from_cbfs },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset},
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining},
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
index 275ccebae7..e0a35fd02e 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
@@ -28,53 +28,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-	 BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-	 BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-	 BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-	 BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-	 BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-	 BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-	 BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-	 BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-	 BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-	 BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-	 BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-	 BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
index 9b44c67bbc..052fc1007e 100644
--- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
@@ -25,53 +25,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-	 BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-	 BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-	 BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-	 BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-	 BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-	 BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-	 BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-	 BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-	 BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-	 BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-	 BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-	 BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
index 9ba60176e9..829b6421e9 100644
--- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
@@ -25,53 +25,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
-	 BiosAllocateBuffer
-	},
-
-	{AGESA_DEALLOCATE_BUFFER,
-	 BiosDeallocateBuffer
-	},
-
-	{AGESA_DO_RESET,
-	 BiosReset
-	},
-
-	{AGESA_LOCATE_BUFFER,
-	 BiosLocateBuffer
-	},
-
-	{AGESA_READ_SPD,
-	 BiosReadSpd
-	},
-
-	{AGESA_READ_SPD_RECOVERY,
-	 BiosDefaultRet
-	},
-
-	{AGESA_RUNFUNC_ONAP,
-	 BiosRunFuncOnAp
-	},
-
-	{AGESA_GNB_PCIE_SLOT_RESET,
-	 BiosGnbPcieSlotReset
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT,
-	 BiosHookBeforeDramInit
-	},
-
-	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,
-	 BiosHookBeforeDramInitRecovery
-	},
-
-	{AGESA_HOOKBEFORE_DQS_TRAINING,
-	 BiosHookBeforeDQSTraining
-	},
-
-	{AGESA_HOOKBEFORE_EXIT_SELF_REF,
-	 BiosHookBeforeExitSelfRefresh
-	},
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit},
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
 };
 
 AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
index 32fc47e0e4..85285bf798 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
@@ -73,59 +73,17 @@ static void restore_socket(UINT8 original_value)
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{
-		AGESA_ALLOCATE_BUFFER,
-		BiosAllocateBuffer
-	},
-
-	{
-		AGESA_DEALLOCATE_BUFFER,
-		BiosDeallocateBuffer
-	},
-
-	{
-		AGESA_DO_RESET,
-		BiosReset
-	},
-
-	{
-		AGESA_LOCATE_BUFFER,
-		BiosLocateBuffer
-	},
-
-	{
-		AGESA_READ_SPD,
-		BiosReadSpd
-	},
-
-	{
-		AGESA_READ_SPD_RECOVERY,
-		BiosDefaultRet
-	},
-
-	{
-		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_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{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_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
index 708b0fc2ee..ef799f3d8d 100644
--- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
@@ -27,59 +27,17 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{
-		AGESA_ALLOCATE_BUFFER,
-		BiosAllocateBuffer
-	},
-
-	{
-		AGESA_DEALLOCATE_BUFFER,
-		BiosDeallocateBuffer
-	},
-
-	{
-		AGESA_DO_RESET,
-		BiosReset
-	},
-
-	{
-		AGESA_LOCATE_BUFFER,
-		BiosLocateBuffer
-	},
-
-	{
-		AGESA_READ_SPD,
-		BiosReadSpd
-	},
-
-	{
-		AGESA_READ_SPD_RECOVERY,
-		BiosDefaultRet
-	},
-
-	{
-		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_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{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_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c
index 00a1bef4aa..58a13f2f59 100644
--- a/src/mainboard/tyan/s8226/BiosCallOuts.c
+++ b/src/mainboard/tyan/s8226/BiosCallOuts.c
@@ -81,59 +81,17 @@ static void restore_socket(UINT8 original_value)
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{
-		AGESA_ALLOCATE_BUFFER,
-		BiosAllocateBuffer
-	},
-
-	{
-		AGESA_DEALLOCATE_BUFFER,
-		BiosDeallocateBuffer
-	},
-
-	{
-		AGESA_DO_RESET,
-		BiosReset
-	},
-
-	{
-		AGESA_LOCATE_BUFFER,
-		BiosLocateBuffer
-	},
-
-	{
-		AGESA_READ_SPD,
-		BiosReadSpd
-	},
-
-	{
-		AGESA_READ_SPD_RECOVERY,
-		BiosDefaultRet
-	},
-
-	{
-		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_ALLOCATE_BUFFER,			BiosAllocateBuffer },
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
+	{AGESA_DO_RESET,			BiosReset },
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
+	{AGESA_READ_SPD,			BiosReadSpd },
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
+	{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_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)