7 files changed, 37 insertions, 117 deletions
diff --git a/src/mainboard/google/auron/spd.c b/src/mainboard/google/auron/spd.c
index 751569e843..20d7498a7b 100644
--- a/src/mainboard/google/auron/spd.c
+++ b/src/mainboard/google/auron/spd.c
@@ -19,7 +19,7 @@
 #define SPD_PART_OFF		128
 #define SPD_PART_LEN		18
 
-void mainboard_print_spd_info(uint8_t spd[])
+static void mainboard_print_spd_info(uint8_t spd[])
 {
 	const int spd_banks[8] = {  8, 16, 32, 64, -1, -1, -1, -1 };
 	const int spd_capmb[8] = {  1,  2,  4,  8, 16, 32, 64,  0 };
@@ -68,3 +68,28 @@ void mainboard_print_spd_info(uint8_t spd[])
 		       capmb / 8 * busw / devw * ranks);
 	}
 }
+
+void fill_spd_for_index(uint8_t spd[], unsigned int spd_index)
+{
+	size_t spd_file_len;
+	uint8_t *spd_file = cbfs_map("spd.bin", &spd_file_len);
+
+	if (!spd_file)
+		die("SPD data not found.");
+
+	if (spd_file_len < SPD_LEN)
+		die("Missing SPD data.");
+
+	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
+		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
+		spd_index = 0;
+	}
+
+	memcpy(spd, spd_file + (spd_index * SPD_LEN), SPD_LEN);
+
+	/* Make sure a valid SPD was found */
+	if (spd[0] == 0)
+		die("Invalid SPD data.");
+
+	mainboard_print_spd_info(spd);
+}
diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h
index 7a0e64d6e3..87986a9f1e 100644
--- a/src/mainboard/google/auron/variant.h
+++ b/src/mainboard/google/auron/variant.h
@@ -13,7 +13,7 @@ void variant_romstage_entry(struct romstage_params *rp);
 void lan_init(void);
 
 void mainboard_fill_spd_data(struct pei_data *pei_data);
-void mainboard_print_spd_info(uint8_t spd[]);
+void fill_spd_for_index(uint8_t spd[], unsigned int index);
 
 #define SPD_LEN			256
 
diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c
index bf5c6119f4..ba829d0a78 100644
--- a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c
+++ b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c
@@ -26,8 +26,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	};
 	int spd_gpio[3];
 	int spd_index;
-	size_t spd_file_len;
-	char *spd_file;
 
 	spd_gpio[0] = get_gpio(SPD_GPIO_BIT0);
 	spd_gpio[1] = get_gpio(SPD_GPIO_BIT1);
@@ -41,31 +39,12 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	       spd_bits[1], spd_gpio[1],
 	       spd_bits[0], spd_gpio[0]);
 
-	spd_file = cbfs_map("spd.bin", &spd_file_len);
-	if (!spd_file)
-		die("SPD data not found.");
+	fill_spd_for_index(pei_data->spd_data[0][0], spd_index);
 
-	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
-		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
-		spd_index = 0;
-	}
-
-	if (spd_file_len < SPD_LEN)
-		die("Missing SPD data.");
-
-	memcpy(pei_data->spd_data[0][0],
-		spd_file + (spd_index * SPD_LEN), SPD_LEN);
 	/* Index 0-2 are 4GB config with both CH0 and CH1.
 	 * Index 4-6 are 2GB config with CH0 only. */
 	if (spd_index > 3)
 		pei_data->dimm_channel1_disabled = 3;
 	else
-		memcpy(pei_data->spd_data[1][0],
-			spd_file + (spd_index * SPD_LEN), SPD_LEN);
-
-	/* Make sure a valid SPD was found */
-	if (pei_data->spd_data[0][0][0] == 0)
-		die("Invalid SPD data.");
-
-	mainboard_print_spd_info(pei_data->spd_data[0][0]);
+		memcpy(pei_data->spd_data[1][0], pei_data->spd_data[0][0], SPD_LEN);
 }
diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c
index bf5c6119f4..ba829d0a78 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c
@@ -26,8 +26,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	};
 	int spd_gpio[3];
 	int spd_index;
-	size_t spd_file_len;
-	char *spd_file;
 
 	spd_gpio[0] = get_gpio(SPD_GPIO_BIT0);
 	spd_gpio[1] = get_gpio(SPD_GPIO_BIT1);
@@ -41,31 +39,12 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	       spd_bits[1], spd_gpio[1],
 	       spd_bits[0], spd_gpio[0]);
 
-	spd_file = cbfs_map("spd.bin", &spd_file_len);
-	if (!spd_file)
-		die("SPD data not found.");
+	fill_spd_for_index(pei_data->spd_data[0][0], spd_index);
 
-	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
-		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
-		spd_index = 0;
-	}
-
-	if (spd_file_len < SPD_LEN)
-		die("Missing SPD data.");
-
-	memcpy(pei_data->spd_data[0][0],
-		spd_file + (spd_index * SPD_LEN), SPD_LEN);
 	/* Index 0-2 are 4GB config with both CH0 and CH1.
 	 * Index 4-6 are 2GB config with CH0 only. */
 	if (spd_index > 3)
 		pei_data->dimm_channel1_disabled = 3;
 	else
-		memcpy(pei_data->spd_data[1][0],
-			spd_file + (spd_index * SPD_LEN), SPD_LEN);
-
-	/* Make sure a valid SPD was found */
-	if (pei_data->spd_data[0][0][0] == 0)
-		die("Invalid SPD data.");
-
-	mainboard_print_spd_info(pei_data->spd_data[0][0]);
+		memcpy(pei_data->spd_data[1][0], pei_data->spd_data[0][0], SPD_LEN);
 }
diff --git a/src/mainboard/google/auron/variants/gandof/spd/spd.c b/src/mainboard/google/auron/variants/gandof/spd/spd.c
index 5a3ad4fc9b..5cd3ddcb15 100644
--- a/src/mainboard/google/auron/variants/gandof/spd/spd.c
+++ b/src/mainboard/google/auron/variants/gandof/spd/spd.c
@@ -26,8 +26,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	};
 	int spd_gpio[3];
 	int spd_index;
-	size_t spd_file_len;
-	char *spd_file;
 
 	spd_gpio[0] = get_gpio(SPD_GPIO_BIT0);
 	spd_gpio[1] = get_gpio(SPD_GPIO_BIT1);
@@ -41,31 +39,12 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	       spd_bits[1], spd_gpio[1],
 	       spd_bits[0], spd_gpio[0]);
 
-	spd_file = cbfs_map("spd.bin", &spd_file_len);
-	if (!spd_file)
-		die("SPD data not found.");
+	fill_spd_for_index(pei_data->spd_data[0][0], spd_index);
 
-	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
-		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
-		spd_index = 0;
-	}
-
-	if (spd_file_len < SPD_LEN)
-		die("Missing SPD data.");
-
-	memcpy(pei_data->spd_data[0][0],
-		spd_file + (spd_index * SPD_LEN), SPD_LEN);
 	/* Index 0-2 are 4GB config with both CH0 and CH1.
 	 * Index 4-6 are 2GB config with CH0 only. */
 	if (spd_index > 3)
 		pei_data->dimm_channel1_disabled = 3;
 	else
-		memcpy(pei_data->spd_data[1][0],
-			spd_file + (spd_index * SPD_LEN), SPD_LEN);
-
-	/* Make sure a valid SPD was found */
-	if (pei_data->spd_data[0][0][0] == 0)
-		die("Invalid SPD data.");
-
-	mainboard_print_spd_info(pei_data->spd_data[0][0]);
+		memcpy(pei_data->spd_data[1][0], pei_data->spd_data[0][0], SPD_LEN);
 }
diff --git a/src/mainboard/google/auron/variants/lulu/spd/spd.c b/src/mainboard/google/auron/variants/lulu/spd/spd.c
index c7572891fc..d80d3c0424 100644
--- a/src/mainboard/google/auron/variants/lulu/spd/spd.c
+++ b/src/mainboard/google/auron/variants/lulu/spd/spd.c
@@ -28,8 +28,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	};
 	int spd_gpio[4];
 	int spd_index;
-	size_t spd_file_len;
-	char *spd_file;
 
 	spd_gpio[0] = get_gpio(SPD_GPIO_BIT0);
 	spd_gpio[1] = get_gpio(SPD_GPIO_BIT1);
@@ -46,32 +44,12 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 		spd_bits[1], spd_gpio[1],
 		spd_bits[0], spd_gpio[0]);
 
-	spd_file = cbfs_map("spd.bin", &spd_file_len);
-	if (!spd_file)
-		die("SPD data not found.");
-
-	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
-		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
-		spd_index = 0;
-	}
-
-	if (spd_file_len < SPD_LEN)
-		die("Missing SPD data.");
-
 	/* CH0 */
-	memcpy(pei_data->spd_data[0][0],
-		spd_file + (spd_index * SPD_LEN), SPD_LEN);
+	fill_spd_for_index(pei_data->spd_data[0][0], spd_index);
 
 	/* CH1 not used in 2GB configurations */
 	if (!((spd_index == 0b0000) || (spd_index == 0b0011) ||
 	    (spd_index == 0b1010))) {
-		memcpy(pei_data->spd_data[1][0],
-			spd_file + (spd_index * SPD_LEN), SPD_LEN);
+		memcpy(pei_data->spd_data[1][0], pei_data->spd_data[0][0], SPD_LEN);
 	}
-
-	/* Make sure a valid SPD was found */
-	if (pei_data->spd_data[0][0][0] == 0)
-		die("Invalid SPD data.");
-
-	mainboard_print_spd_info(pei_data->spd_data[0][0]);
 }
diff --git a/src/mainboard/google/auron/variants/samus/spd/spd.c b/src/mainboard/google/auron/variants/samus/spd/spd.c
index 70e55cf635..25ff928b6d 100644
--- a/src/mainboard/google/auron/variants/samus/spd/spd.c
+++ b/src/mainboard/google/auron/variants/samus/spd/spd.c
@@ -28,8 +28,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	};
 	int spd_gpio[4];
 	int spd_index;
-	size_t spd_file_len;
-	char *spd_file;
 
 	spd_gpio[0] = get_gpio(spd_bits[0]);
 	spd_gpio[1] = get_gpio(spd_bits[1]);
@@ -44,26 +42,8 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	       spd_bits[3], spd_gpio[3], spd_bits[2], spd_gpio[2],
 	       spd_bits[1], spd_gpio[1], spd_bits[0], spd_gpio[0]);
 
-	spd_file = cbfs_map("spd.bin", &spd_file_len);
-	if (!spd_file)
-		die("SPD data not found.");
-
-	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
-		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
-		spd_index = 0;
-	}
-
-	if (spd_file_len < SPD_LEN)
-		die("Missing SPD data.");
+	fill_spd_for_index(pei_data->spd_data[0][0], spd_index);
 
 	/* Assume same memory in both channels */
-	spd_index *= SPD_LEN;
-	memcpy(pei_data->spd_data[0][0], spd_file + spd_index, SPD_LEN);
-	memcpy(pei_data->spd_data[1][0], spd_file + spd_index, SPD_LEN);
-
-	/* Make sure a valid SPD was found */
-	if (pei_data->spd_data[0][0][0] == 0)
-		die("Invalid SPD data.");
-
-	mainboard_print_spd_info(pei_data->spd_data[0][0]);
+	memcpy(pei_data->spd_data[1][0], pei_data->spd_data[0][0], SPD_LEN);
 }