Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6199
-gerrit
commit 8382a70d989963e0a23f62f7fff47cd20091a08b Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Mon Jul 7 21:08:23 2014 +1000
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 --- src/vendorcode/amd/agesa/f10/Proc/Mem/mu.h | 2 +- src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h | 10 ++----- src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h | 19 +------------ src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h | 9 +------ src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h | 15 +---------- src/vendorcode/amd/agesa/f15/Proc/Mem/mu.h | 15 +---------- .../amd/agesa/f15tn/Proc/GNB/Common/Gnb.h | 10 ++----- src/vendorcode/amd/agesa/f15tn/Proc/Mem/mu.h | 28 +------------------ .../amd/agesa/f16kb/Proc/GNB/Common/Gnb.h | 10 ++----- src/vendorcode/amd/agesa/f16kb/Proc/Mem/mu.h | 31 +--------------------- 10 files changed, 13 insertions(+), 136 deletions(-)
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f10/Proc/Mem/mu.h index fc19314..9c4ad01 100644 --- a/src/vendorcode/amd/agesa/f10/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f10/Proc/Mem/mu.h @@ -60,7 +60,7 @@ #define PSO_ENTRY UINT8 #endif
-#define MAX(X, Y) (((X) < (Y)) ? (Y) : (X)) +#include <stdlib.h>
/*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h index 6839ba5..d249d8b 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h @@ -46,6 +46,8 @@ #ifndef _GNB_H_ #define _GNB_H_
+#include <stdlib.h> + #pragma pack (push, 1)
#define GNB_DEADLOOP() \ @@ -70,14 +72,6 @@ #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 PVOID UINT64 diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h index 1a22420..335f39d 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h @@ -60,24 +60,7 @@ #define PSO_ENTRY UINT8 #endif
-// -// 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)) - - +#include <stdlib.h>
/*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h index 8f5c179..5aa574e 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h +++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h @@ -46,6 +46,7 @@ #ifndef _GNB_H_ #define _GNB_H_
+#include <stdlib.h>
#define GNB_DEADLOOP() \ { \ @@ -69,14 +70,6 @@ #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 GnbLibGetHeader(x) ((AMD_CONFIG_PARAMS*) (x)->StdHeader) diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h index 2a9067d..23925b2 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h @@ -62,20 +62,7 @@ #define PSO_ENTRY UINT8 #endif
-// -// 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)) - - +#include <stdlib.h>
/*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f15/Proc/Mem/mu.h index 20d369b..c68f321 100644 --- a/src/vendorcode/amd/agesa/f15/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/mu.h @@ -61,20 +61,7 @@ #define PSO_ENTRY UINT8 #endif
-// -// 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)) - - +#include <stdlib.h>
/*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/Gnb.h b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/Gnb.h index 1a239bd..b93e164 100644 --- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/Gnb.h +++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/Gnb.h @@ -45,6 +45,8 @@ #ifndef _GNB_H_ #define _GNB_H_
+#include <stdlib.h> + #pragma pack (push, 1)
#define GNB_DEADLOOP() \ @@ -69,14 +71,6 @@ #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 PVOID UINT64 diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/mu.h index 2933453..2c6941d 100644 --- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/mu.h @@ -60,33 +60,7 @@ #define PSO_ENTRY UINT8 #endif
-// -// 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) - +#include <stdlib.h>
/*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Gnb.h b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Gnb.h index 100ae03..c01fd5e 100644 --- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Gnb.h +++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Gnb.h @@ -45,6 +45,8 @@ #ifndef _GNB_H_ #define _GNB_H_
+#include <stdlib.h> + #include "Ids.h"
#pragma pack (push, 1) @@ -71,14 +73,6 @@ #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 PVOID UINT32 diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/mu.h b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/mu.h index 1489fe8..f415e52 100644 --- a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/mu.h +++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/mu.h @@ -60,36 +60,7 @@ #define PSO_ENTRY UINT8 #endif
-// -// 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 +#include <stdlib.h> // // Find offset of a member variable in a struct //