From 5266fe4d97225aab77145c95147e876402dd6479 Mon Sep 17 00:00:00 2001
From: Shawn Nematbakhsh <shawnn@chromium.org>
Date: Wed, 10 Dec 2014 12:03:55 -0800
Subject: auron: Remove duplicate pei_data assignment

Merge artifact -- don't check spd_index twice.

BUG=None
TEST=Build only
BRANCH=Auron

Original-Change-Id: I0cc372fec415646854aa931949ed0f57b473cb01
Original-Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/234421
Original-Reviewed-by: Bernie Thompson <bhthompson@chromium.org>

(cherry picked from commit 850125141b52886c845161434a1320676e59534d)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: I0070e3f26ebddba716905ebb934bcec4715c4b05
Reviewed-on: http://review.coreboot.org/11912
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)
---
 src/mainboard/google/auron/spd/spd.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mainboard/google/auron/spd/spd.c b/src/mainboard/google/auron/spd/spd.c
index 4f35477e4a..ce3752433a 100644
--- a/src/mainboard/google/auron/spd/spd.c
+++ b/src/mainboard/google/auron/spd/spd.c
@@ -110,9 +110,6 @@ void mainboard_fill_spd_data(struct pei_data *pei_data)
 	if (!spd_file)
 		die("SPD data not found.");
 
-	if (spd_index > 3)
-		pei_data->dimm_channel1_disabled = 3;
-
 	if (spd_file_len < ((spd_index + 1) * SPD_LEN)) {
 		printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
 		spd_index = 0;
-- 
cgit v1.2.3