summaryrefslogtreecommitdiff
path: root/src/vendorcode/amd/agesa/f14
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2015-03-05 14:35:04 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-03-07 21:22:20 +0100
commit0127c6c80865384faa43602bf22b3a70147343d9 (patch)
treefc56798fa2d98ff7eb0f248156dd6c2d9e1bb40a /src/vendorcode/amd/agesa/f14
parentc13fc15a45560b84da77a9ca74af050d1bc19bec (diff)
downloadcoreboot-0127c6c80865384faa43602bf22b3a70147343d9.tar.xz
AMD: Uniformly define MSRs for TOP_MEM and TOP_MEM2
Make the build tolerate re-definitions. Change-Id: Ia7505837c70b1f749262508b26576e95c7865576 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/8609 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/vendorcode/amd/agesa/f14')
-rw-r--r--src/vendorcode/amd/agesa/f14/AGESA.h8
-rw-r--r--src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h2
2 files changed, 3 insertions, 7 deletions
diff --git a/src/vendorcode/amd/agesa/f14/AGESA.h b/src/vendorcode/amd/agesa/f14/AGESA.h
index a8ede95e7f..d997ad1636 100644
--- a/src/vendorcode/amd/agesa/f14/AGESA.h
+++ b/src/vendorcode/amd/agesa/f14/AGESA.h
@@ -1129,12 +1129,8 @@ typedef enum {
///< CPU MSR Register definitions ------------------------------------------
#define SYS_CFG 0xC0010010
-#ifndef TOP_MEM
-#define TOP_MEM 0xC001001A
-#endif
-#ifndef TOP_MEM2
-#define TOP_MEM2 0xC001001D
-#endif
+#define TOP_MEM 0xC001001Aul
+#define TOP_MEM2 0xC001001Dul
#define HWCR 0xC0010015
#define NB_CFG 0xC001001F
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
index 6369bfca48..a6f6c7819e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
@@ -98,7 +98,7 @@
#define NorthbridgeCapabilities 0xE8
#define DRAMBase0 0x40
#define MMIOBase0 0x80
-#define TOP_MEM 0xC001001A
+#define TOP_MEM 0xC001001Aul
#define LOW_NODE_DEVICEID 24
#define LOW_APICID 0