3 files changed, 8 insertions, 5 deletions
diff --git a/src/southbridge/amd/rs780/early_setup.c b/src/southbridge/amd/rs780/early_setup.c
index ab75e5f57f..865b577279 100644
--- a/src/southbridge/amd/rs780/early_setup.c
+++ b/src/southbridge/amd/rs780/early_setup.c
@@ -18,6 +18,7 @@
 #include <northbridge/amd/amdmct/mct/mct_d.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
 
 #include "rev.h"
 #include "rs780.h"
@@ -317,10 +318,10 @@ static void k8_optimization(void)
 	set_nbcfg_enable_bits(k8_f2, 0xA0, 3 << 2, 3 << 2);
 	set_nbcfg_enable_bits(k8_f2, 0xA0, 1 << 5, 1 << 5);
 
-	msr = rdmsr(0xC001001F);
+	msr = rdmsr(NB_CFG_MSR);
 	msr.lo &= ~(1 << 9);
 	msr.hi &= ~(1 << 4);
-	wrmsr(0xC001001F, msr);
+	wrmsr(NB_CFG_MSR, msr);
 }
 #else
 #define k8_optimization() do {} while (0)
diff --git a/src/southbridge/amd/sr5650/early_setup.c b/src/southbridge/amd/sr5650/early_setup.c
index 96adfb5bdd..543cb0efbf 100644
--- a/src/southbridge/amd/sr5650/early_setup.c
+++ b/src/southbridge/amd/sr5650/early_setup.c
@@ -20,6 +20,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
 #include <option.h>
 #include <reset.h>
 #include "sr5650.h"
@@ -309,9 +310,9 @@ void fam10_optimization(void)
 		return;
 
 	printk(BIOS_INFO, "fam10_optimization()\n");
-	msr = rdmsr(0xC001001F);
+	msr = rdmsr(NB_CFG_MSR);
 	msr.hi |= 1 << 14;	/* bit 46: EnableCf8ExtCfg */
-	wrmsr(0xC001001F, msr);
+	wrmsr(NB_CFG_MSR, msr);
 
 	cpu_f0 = PCI_DEV(0, 0x18, 0);
 	cpu_f2 = PCI_DEV(0, 0x18, 2);
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c
index 1c2fe48407..1e85c48986 100644
--- a/src/southbridge/amd/sr5650/sr5650.c
+++ b/src/southbridge/amd/sr5650/sr5650.c
@@ -22,6 +22,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <stdlib.h>
 #include <delay.h>
@@ -40,7 +41,7 @@ struct resource *sr5650_retrieve_cpu_mmio_resource()
 	for (domain = all_devices; domain; domain = domain->next) {
 		if (domain->bus->dev->path.type != DEVICE_PATH_DOMAIN)
 			continue;
-		res = probe_resource(domain->bus->dev, 0xc0010058);
+		res = probe_resource(domain->bus->dev, MMIO_CONF_BASE);
 		if (res)
 			return res;
 	}