diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-07-07 21:08:23 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-07-18 07:20:16 +0200 |
| commit | cd47560f2ae0758012001d6d954653b4526811ad (patch) | |
| tree | 3dc23e7f9960f152f0492e9d5b49b45d9e9e91e9 /src/vendorcode/amd/agesa/f12/Proc | |
| parent | 53584fa32f18eafa1f71be511f20d388550b918b (diff) | |
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>
Diffstat (limited to 'src/vendorcode/amd/agesa/f12/Proc')
| -rw-r--r-- | src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h | 10 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f12/Proc/Mem/mu.h | 19 |
2 files changed, 3 insertions, 26 deletions
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 f81ca3dc05..3753bbcc54 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 5ddf2e3cab..9fc8559c25 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 |