From 0127c6c80865384faa43602bf22b3a70147343d9 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 5 Mar 2015 14:35:04 +0200 Subject: AMD: Uniformly define MSRs for TOP_MEM and TOP_MEM2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the build tolerate re-definitions. Change-Id: Ia7505837c70b1f749262508b26576e95c7865576 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/8609 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/include/cpu/amd/mtrr.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/include') diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h index a9e672b48b..be816ba5aa 100644 --- a/src/include/cpu/amd/mtrr.h +++ b/src/include/cpu/amd/mtrr.h @@ -25,13 +25,12 @@ #define IORRBase_MSR(reg) (0xC0010016 + 2 * (reg)) #define IORRMask_MSR(reg) (0xC0010016 + 2 * (reg) + 1) -#define TOP_MEM_MSR 0xC001001A -#define TOP_MEM2_MSR 0xC001001D -#ifndef TOP_MEM - #define TOP_MEM TOP_MEM_MSR -#endif -#ifndef TOP_MEM2 - #define TOP_MEM2 TOP_MEM2_MSR +#if defined(__ASSEMBLER__) +#define TOP_MEM 0xC001001A +#define TOP_MEM2 0xC001001D +#else +#define TOP_MEM 0xC001001Aul +#define TOP_MEM2 0xC001001Dul #endif #define TOP_MEM_MASK 0x007fffff -- cgit v1.2.3