From d35c7fe1bff55471c62b11d208cf3a71dec30d6d Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Tue, 30 Oct 2018 07:07:00 +0100
Subject: amd/mtrr: Fix IORR MTRR

IORR MTRR definitions renamed to avoid collision
between <cpu/amd/mtrr.h> and <AGESA.h>.

Change-Id: I3eeb0c69bbb76039039dc90683670cafcb00ed36
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29352
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/include/cpu/amd/mtrr.h | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'src/include')

diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index 46d66f8cef23..f6b213e69d75 100644
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -1,20 +1,10 @@
 #ifndef CPU_AMD_MTRR_H
 #define CPU_AMD_MTRR_H
 
-/* FIXME
- * Replace
- * #define IORR_FIRST 0xC0010016
- * #define IORR_LAST  0xC0010019
- * with
- * #define IORR0_BASE 0xC0010016
- * #define IORR0_MASK 0xC0010017
- * #define IORR1_BASE 0xC0010018
- * #define IORR1_MASK 0xC0010019
- * those are also defined in vendorcode <AGESA.h> file.
- */
-
-#define IORR_FIRST 0xC0010016
-#define IORR_LAST  0xC0010019
+#define MTRR_IORR0_BASE	0xC0010016
+#define MTRR_IORR0_MASK	0xC0010017
+#define MTRR_IORR1_BASE	0xC0010018
+#define MTRR_IORR1_MASK	0xC0010019
 
 #define MTRR_READ_MEM			(1 << 4)
 #define MTRR_WRITE_MEM			(1 << 3)
-- 
cgit v1.2.3