vendorcode/amd/agesa: Use macros already defined in stdlib.h

We already have these macros define in 'stdlib.h'. Make good use of them
here to avoid redefinition conflicts of the pre-processor depending on
header inclusion ordering. This has the nice side-effect of syncing up
AGESA families in this particular regard.

Change-Id: Icf911629a4a1a82b01062fe16af4c8f812b05717
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6199
Tested-by: build bot (Jenkins)
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>
This commit is contained in:
Edward O'Callaghan 2014-07-07 21:08:23 +10:00
parent 53584fa32f
commit cd47560f2a
10 changed files with 13 additions and 136 deletions

View File

@ -60,7 +60,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X)) #include <stdlib.h>
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* TYPEDEFS, STRUCTURES, ENUMS * TYPEDEFS, STRUCTURES, ENUMS

View File

@ -46,6 +46,8 @@
#ifndef _GNB_H_ #ifndef _GNB_H_
#define _GNB_H_ #define _GNB_H_
#include <stdlib.h>
#pragma pack (push, 1) #pragma pack (push, 1)
#define GNB_DEADLOOP() \ #define GNB_DEADLOOP() \
@ -70,14 +72,6 @@
#endif #endif
#endif #endif
#ifndef MIN
#define MIN(x, y) (((x) > (y))? (y):(x))
#endif
#ifndef MAX
#define MAX(x, y) (((x) > (y))? (x):(y))
#endif
#define OFF 0 #define OFF 0
#define PVOID UINT64 #define PVOID UINT64

View File

@ -60,24 +60,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
// #include <stdlib.h>
// Maximum value macro
//
#ifndef MAX
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X))
#endif
//
// Minimum Value macro
//
#ifndef MIN
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
#endif
//
// Absolute Value Macro
//
#define ABS(X) (((X) < 0) ? (-(X)) : (X))
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* TYPEDEFS, STRUCTURES, ENUMS * TYPEDEFS, STRUCTURES, ENUMS

View File

@ -46,6 +46,7 @@
#ifndef _GNB_H_ #ifndef _GNB_H_
#define _GNB_H_ #define _GNB_H_
#include <stdlib.h>
#define GNB_DEADLOOP() \ #define GNB_DEADLOOP() \
{ \ { \
@ -69,14 +70,6 @@
#endif #endif
#endif #endif
#ifndef MIN
#define MIN(x, y) (((x) > (y))? (y):(x))
#endif
#ifndef MAX
#define MAX(x, y) (((x) > (y))? (x):(y))
#endif
#define OFF 0 #define OFF 0
#define GnbLibGetHeader(x) ((AMD_CONFIG_PARAMS*) (x)->StdHeader) #define GnbLibGetHeader(x) ((AMD_CONFIG_PARAMS*) (x)->StdHeader)

View File

@ -62,20 +62,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
// #include <stdlib.h>
// Maximum value macro
//
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X))
//
// Minimum Value macro
//
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
//
// Absolute Value Macro
//
#define ABS(X) (((X) < 0) ? (-(X)) : (X))
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* TYPEDEFS, STRUCTURES, ENUMS * TYPEDEFS, STRUCTURES, ENUMS

View File

@ -61,20 +61,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
// #include <stdlib.h>
// Maximum value macro
//
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X))
//
// Minimum Value macro
//
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
//
// Absolute Value Macro
//
#define ABS(X) (((X) < 0) ? (-(X)) : (X))
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* TYPEDEFS, STRUCTURES, ENUMS * TYPEDEFS, STRUCTURES, ENUMS

View File

@ -45,6 +45,8 @@
#ifndef _GNB_H_ #ifndef _GNB_H_
#define _GNB_H_ #define _GNB_H_
#include <stdlib.h>
#pragma pack (push, 1) #pragma pack (push, 1)
#define GNB_DEADLOOP() \ #define GNB_DEADLOOP() \
@ -69,14 +71,6 @@
#endif #endif
#endif #endif
#ifndef MIN
#define MIN(x, y) (((x) > (y))? (y):(x))
#endif
#ifndef MAX
#define MAX(x, y) (((x) > (y))? (x):(y))
#endif
#define OFF 0 #define OFF 0
#define PVOID UINT64 #define PVOID UINT64

View File

@ -60,33 +60,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
// #include <stdlib.h>
// Maximum value macro
//
#ifndef MAX
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X))
#endif
//
// Minimum Value macro
//
#ifndef MIN
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
#endif
//
// Absolute Value Macro
//
#ifndef ABS
#define ABS(X) (((X) < 0) ? (-(X)) : (X))
#endif
//
// Taking ceiling of (a / b)
//
#define CEIL_DIV(a, b) (((a) + (b) - 1) / (b))
//
// Check if value x is a power of 2 or not
//
#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0)
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* TYPEDEFS, STRUCTURES, ENUMS * TYPEDEFS, STRUCTURES, ENUMS

View File

@ -45,6 +45,8 @@
#ifndef _GNB_H_ #ifndef _GNB_H_
#define _GNB_H_ #define _GNB_H_
#include <stdlib.h>
#include "Ids.h" #include "Ids.h"
#pragma pack (push, 1) #pragma pack (push, 1)
@ -71,14 +73,6 @@
#endif #endif
#endif #endif
#ifndef MIN
#define MIN(x, y) (((x) > (y))? (y):(x))
#endif
#ifndef MAX
#define MAX(x, y) (((x) > (y))? (x):(y))
#endif
#define OFF 0 #define OFF 0
#define PVOID UINT32 #define PVOID UINT32

View File

@ -60,36 +60,7 @@
#define PSO_ENTRY UINT8 #define PSO_ENTRY UINT8
#endif #endif
// #include <stdlib.h>
// Maximum value macro
//
#ifndef MAX
#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X))
#endif
//
// Minimum Value macro
//
#ifndef MIN
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
#endif
//
// Absolute Value Macro
//
#ifndef ABS
#define ABS(X) (((X) < 0) ? (-(X)) : (X))
#endif
//
// Taking ceiling of (a / b)
//
#ifndef CEIL_DIV
#define CEIL_DIV(a, b) (((a) + (b) - 1) / (b))
#endif
//
// Check if value x is a power of 2 or not
//
#ifndef IS_POWER_OF_2
#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0)
#endif
// //
// Find offset of a member variable in a struct // Find offset of a member variable in a struct
// //