diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index 24c64ee..c5fe8ba 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -3810,7 +3810,7 @@
 }
 #endif
 
-void raminit(const int s3resume)
+void raminit(const int s3resume, const u8 *spd_addrmap)
 {
 	unsigned channel, slot, lane, rank;
 	int i;
@@ -3956,10 +3956,10 @@
 					    0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
 					    0x95
 				};
-				if (slot)
+				if (!spd_addrmap[2 * channel + slot])
 					continue;
 				for (try = 0; try < 5; try++) {
-					v = smbus_read_byte(0x50 + channel,
+					v = smbus_read_byte(spd_addrmap[2 * channel + slot],
 							    DEVICE_TYPE);
 					if (v >= 0)
 						break;
@@ -3973,7 +3973,7 @@
 					gav(info.
 					    spd[channel][0][useful_addresses
 							    [addr]] =
-					    smbus_read_byte(0x50 + channel,
+					    smbus_read_byte(spd_addrmap[2 * channel + slot],
 							    useful_addresses
 							    [addr]));
 				if (info.spd[channel][0][DEVICE_TYPE] != 11)
diff --git a/src/northbridge/intel/nehalem/raminit.h b/src/northbridge/intel/nehalem/raminit.h
index b66b60e..91f0dea 100644
--- a/src/northbridge/intel/nehalem/raminit.h
+++ b/src/northbridge/intel/nehalem/raminit.h
@@ -22,6 +22,13 @@
 
 #include "nehalem.h"
 
-void raminit(int s3resume);
+/* spd_addrmap is array of 4 elements:
+   Channel 0 Slot 0
+   Channel 0 Slot 1
+   Channel 1 Slot 0
+   Channel 1 Slot 1
+   0 means "not present"
+*/
+void raminit(const int s3resume, const u8 *spd_addrmap);
 
 #endif				/* RAMINIT_H */