AGESA: Fix BiosCallouts table formatting

Already done for fam15tn and fam16kb.

Change-Id: I3da36bfe6fd1805867eee5aa1f017c4fda084349
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5660
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

src/mainboard/amd/dinar/BiosCallOuts.c

@@ -88,57 +88,19 @@ static void restore_socket(void)
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-		BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer},
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-		BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-		BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	},
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-	{AGESA_LOCATE_BUFFER,
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-		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)

src/mainboard/amd/inagua/BiosCallOuts.c

@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-		BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-		BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-		BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

src/mainboard/amd/persimmon/BiosCallOuts.c

@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-	 BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-	 BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	 BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

src/mainboard/amd/south_station/BiosCallOuts.c

@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-   BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-  },
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-  {AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-   BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-  },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-  {AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-   BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-  },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-  {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)

src/mainboard/amd/torpedo/BiosCallOuts.c

@@ -39,57 +39,19 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-   BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-  },
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-  {AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-   BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-  },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-  {AGESA_DO_RESET,
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-   BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-  },
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-  {AGESA_LOCATE_BUFFER,
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-   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)

src/mainboard/amd/union_station/BiosCallOuts.c

@@ -26,53 +26,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-   BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-  },
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-  {AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-   BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-  },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-  {AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-   BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-  },
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-  {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)

src/mainboard/asrock/e350m1/BiosCallOuts.c

@@ -26,47 +26,17 @@
 
 CONST BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-  {AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-   BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-  },
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-  {AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-   BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-  },
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-  {AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-   BiosReset
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-  },
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-
-  {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)

src/mainboard/gizmosphere/gizmo/BiosCallOuts.c

@@ -33,53 +33,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-	 BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd_from_cbfs },
-	 BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset},
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	 BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining},
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c

@@ -28,53 +28,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-	 BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-	 BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	 BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

src/mainboard/lippert/frontrunner-af/BiosCallOuts.c

@@ -25,53 +25,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-	 BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-	 BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	 BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

src/mainboard/lippert/toucan-af/BiosCallOuts.c

@@ -25,53 +25,18 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{AGESA_ALLOCATE_BUFFER,
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-	 BiosAllocateBuffer
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-	},
+	{AGESA_DO_RESET,			BiosReset },
-
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-	{AGESA_DEALLOCATE_BUFFER,
+	{AGESA_READ_SPD,			BiosReadSpd },
-	 BiosDeallocateBuffer
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-	},
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-
+	{AGESA_GNB_PCIE_SLOT_RESET,		BiosGnbPcieSlotReset },
-	{AGESA_DO_RESET,
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit},
-	 BiosReset
+	{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY,	BiosHookBeforeDramInitRecovery },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-	{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)

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_ALLOCATE_BUFFER,
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-		BiosAllocateBuffer
+	{AGESA_DO_RESET,			BiosReset },
-	},
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-
+	{AGESA_READ_SPD,			BiosReadSpd },
-	{
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-		AGESA_DEALLOCATE_BUFFER,
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-		BiosDeallocateBuffer
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	{
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-		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)

src/mainboard/supermicro/h8scm/BiosCallOuts.c

@@ -27,59 +27,17 @@
 
 STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
-	{
+	{AGESA_ALLOCATE_BUFFER,			BiosAllocateBuffer },
-		AGESA_ALLOCATE_BUFFER,
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-		BiosAllocateBuffer
+	{AGESA_DO_RESET,			BiosReset },
-	},
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-
+	{AGESA_READ_SPD,			BiosReadSpd },
-	{
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-		AGESA_DEALLOCATE_BUFFER,
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-		BiosDeallocateBuffer
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	{
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-		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)

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_ALLOCATE_BUFFER,
+	{AGESA_DEALLOCATE_BUFFER,		BiosDeallocateBuffer },
-		BiosAllocateBuffer
+	{AGESA_DO_RESET,			BiosReset },
-	},
+	{AGESA_LOCATE_BUFFER,			BiosLocateBuffer },
-
+	{AGESA_READ_SPD,			BiosReadSpd },
-	{
+	{AGESA_READ_SPD_RECOVERY,		BiosDefaultRet },
-		AGESA_DEALLOCATE_BUFFER,
+	{AGESA_RUNFUNC_ONAP,			BiosRunFuncOnAp },
-		BiosDeallocateBuffer
+	{AGESA_GET_IDS_INIT_DATA,		BiosGetIdsInitData },
-	},
+	{AGESA_HOOKBEFORE_DQS_TRAINING,		BiosHookBeforeDQSTraining },
-
+	{AGESA_HOOKBEFORE_DRAM_INIT,		BiosHookBeforeDramInit },
-	{
+	{AGESA_HOOKBEFORE_EXIT_SELF_REF,	BiosHookBeforeExitSelfRefresh },
-		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)