BiosCallOuts: Replace REQUIRED_CALLOUTS define with flexible variable

Size of BiosCallouts[] struct can be calculated as:

        CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);

There is no longer need for REQUIRED_CALLOUTS define.

Originally that change was done for AMD Persimmon in

        commit d7a696d0f2
        Author: efdesign98 <efdesign98@gmail.com>
        Date:   Thu Sep 15 15:24:26 2011 -0600

            Persimmon updates for AMD F14 rev C0

without deleting the define. This was ported to some of the other
boards and for some the define was not removed.

The AMD Inagua, Parmer and Thatcher boards were already adapted but
the define was left in. So just remove it for those.

Tested on Supermicro H8QGI.

Change-Id: Ia09795579a1170fa20ab94a30feb1af6821153d2
Signed-off-by: Aladyshev Konstantin <aladyshev@nicevt.ru>
Reviewed-on: http://review.coreboot.org/2049
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martin@se-eng.com>
Reviewed-by: Marc Jones <marcj303@gmail.com>
This commit is contained in:
Aladyshev Konstantin 2012-12-19 00:58:35 +04:00 committed by Marc Jones
parent b01097e0fe
commit 3d63b0a965
11 changed files with 21 additions and 24 deletions

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x00010000
#define BIOS_HEAP_SIZE 0x20000 /* 64MB */

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x010000000
#define BIOS_HEAP_SIZE 0x30000
#define BSP_STACK_BASE_ADDR 0x30000

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x010000000
#define BIOS_HEAP_SIZE 0x30000
#define BSP_STACK_BASE_ADDR 0x30000

View File

@ -23,12 +23,7 @@
#include "heapManager.h"
#include "SB800.h"
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
AGESA_STATUS CalloutStatus;
CONST BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
CONST BIOS_CALLOUT_STRUCT BiosCallouts[] =
{
{AGESA_ALLOCATE_BUFFER,
BiosAllocateBuffer
@ -73,7 +68,13 @@ CONST BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
},
};
for (i = 0; i < REQUIRED_CALLOUTS; i++)
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
AGESA_STATUS CalloutStatus;
UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
for (i = 0; i < CallOutCount; i++)
{
if (BiosCallouts[i].CalloutName == Func)
{
@ -81,7 +82,7 @@ CONST BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
}
}
if(i >= REQUIRED_CALLOUTS)
if(i >= CallOutCount)
{
return AGESA_UNSUPPORTED;
}

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x00010000
#define BIOS_HEAP_SIZE 0x20000 /* 64MB */

View File

@ -24,7 +24,7 @@
#include "OptionsIds.h"
#include "heapManager.h"
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
{
{
AGESA_ALLOCATE_BUFFER,
@ -87,14 +87,15 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
AGESA_STATUS CalloutStatus;
UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
for (i = 0; i < REQUIRED_CALLOUTS; i++) {
for (i = 0; i < CallOutCount; i++) {
if (BiosCallouts[i].CalloutName == Func) {
break;
}
}
if(i >= REQUIRED_CALLOUTS) {
if(i >= CallOutCount) {
return AGESA_UNSUPPORTED;
}

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x00010000
#define BIOS_HEAP_SIZE 0x20000 /* 64MB */

View File

@ -24,7 +24,7 @@
#include "OptionsIds.h"
#include "heapManager.h"
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
{
{
AGESA_ALLOCATE_BUFFER,
@ -87,14 +87,15 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
AGESA_STATUS CalloutStatus;
UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
for (i = 0; i < REQUIRED_CALLOUTS; i++) {
for (i = 0; i < CallOutCount; i++) {
if (BiosCallouts[i].CalloutName == Func) {
break;
}
}
if(i >= REQUIRED_CALLOUTS) {
if(i >= CallOutCount) {
return AGESA_UNSUPPORTED;
}

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x00010000
#define BIOS_HEAP_SIZE 0x20000 /* 64MB */

View File

@ -24,7 +24,7 @@
#include "OptionsIds.h"
#include "heapManager.h"
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
{
{
AGESA_ALLOCATE_BUFFER,
@ -87,14 +87,15 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
{
UINTN i;
AGESA_STATUS CalloutStatus;
UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
for (i = 0; i < REQUIRED_CALLOUTS; i++) {
for (i = 0; i < CallOutCount; i++) {
if (BiosCallouts[i].CalloutName == Func) {
break;
}
}
if(i >= REQUIRED_CALLOUTS) {
if(i >= CallOutCount) {
return AGESA_UNSUPPORTED;
}

View File

@ -23,7 +23,6 @@
#include "Porting.h"
#include "AGESA.h"
#define REQUIRED_CALLOUTS 12
#define BIOS_HEAP_START_ADDRESS 0x00010000
#define BIOS_HEAP_SIZE 0x20000 /* 64MB */