From cd47560f2ae0758012001d6d954653b4526811ad Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 7 Jul 2014 21:08:23 +1000 Subject: 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 Reviewed-on: http://review.coreboot.org/6199 Tested-by: build bot (Jenkins) Reviewed-by: Bruce Griffith --- src/vendorcode/amd/agesa/f14/Proc/GNB/Common/Gnb.h | 9 +-------- src/vendorcode/amd/agesa/f14/Proc/Mem/mu.h | 15 +-------------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'src/vendorcode/amd/agesa/f14/Proc') 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 af467f3eed..8a3700f40d 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 #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 4b4878824a..d64047bcbe 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 /*---------------------------------------------------------------------------- * TYPEDEFS, STRUCTURES, ENUMS -- cgit v1.2.3