auron_yuna: Update RAMID table for 2nd source memory.
remove unused memory spd Micron_4KTF25664HZ
add 2nd source Micron and Samsung memory
1.Samsung K4B4G1646E-BYK0
2.Micron MT41K256M16TW-107
BUG=chrome-os-partner:61541
TEST=emerge-auron_yuna coreboot
Change-Id: I7f510b9b63de2c457db27cc11b77fd315be33572
Signed-off-by: Tim Chen <Tim-Chen@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/425472
Reviewed-by: Shawn N <shawnn@chromium.org>
diff --git a/src/mainboard/google/auron_yuna/spd/Makefile.inc b/src/mainboard/google/auron_yuna/spd/Makefile.inc
index 7f838b74..3d4d0b0 100644
--- a/src/mainboard/google/auron_yuna/spd/Makefile.inc
+++ b/src/mainboard/google/auron_yuna/spd/Makefile.inc
@@ -22,14 +22,14 @@
SPD_BIN = $(obj)/spd.bin
# { GPIO47, GPIO9, GPIO13 }
-SPD_SOURCES = Micron_4KTF25664HZ # 0b0000
+SPD_SOURCES = micron_MT41K256M16TW-107 # 0b0000
SPD_SOURCES += Hynix_HMT425S6AFR6A # 0b0001
SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR # 0b0010
-SPD_SOURCES += Micron_4KTF25664HZ # 0b0011
-SPD_SOURCES += Micron_4KTF25664HZ # 0b0100
+SPD_SOURCES += samsung_K4B4G1646E-BYK0 # 0b0011
+SPD_SOURCES += micron_MT41K256M16TW-107 # 0b0100
SPD_SOURCES += Hynix_HMT425S6AFR6A # 0b0101
SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR # 0b0110
-SPD_SOURCES += empty # 0b0111
+SPD_SOURCES += samsung_K4B4G1646E-BYK0 # 0b0111
SPD_SOURCES += empty # 0b1000
SPD_SOURCES += empty # 0b1001
SPD_SOURCES += empty # 0b1010
diff --git a/src/mainboard/google/auron_yuna/spd/micron_MT41K256M16TW-107.spd.hex b/src/mainboard/google/auron_yuna/spd/micron_MT41K256M16TW-107.spd.hex
new file mode 100644
index 0000000..91133b4
--- /dev/null
+++ b/src/mainboard/google/auron_yuna/spd/micron_MT41K256M16TW-107.spd.hex
@@ -0,0 +1,32 @@
+92 13 0b 03 04 19 02 02
+03 11 01 08 09 00 fe 02
+69 78 69 30 69 11 10 79
+20 08 3c 3c 01 18 83 05
+00 00 ca 00 00 00 00 00
+00 88 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 0f 01 62 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 80 2c 00
+00 00 00 00 00 00 45 1d
+34 4b 54 46 32 35 36 36
+34 48 5a 2d 31 47 39 50
+31 20 50 31 80 2c 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff
diff --git a/src/mainboard/google/auron_yuna/spd/samsung_K4B4G1646E-BYK0.spd.hex b/src/mainboard/google/auron_yuna/spd/samsung_K4B4G1646E-BYK0.spd.hex
new file mode 100644
index 0000000..841291b
--- /dev/null
+++ b/src/mainboard/google/auron_yuna/spd/samsung_K4B4G1646E-BYK0.spd.hex
@@ -0,0 +1,17 @@
+# Samsung K4B4G1646E-BYK0
+92 13 0B 03 04 19 02 02 03 11 01 08 0A 00 FE 00
+69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 01
+00 00 00 00 00 00 00 00 00 88 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0F 01 62 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 CE 01 00 00 00 00 00 00 CA 0F
+4D 34 37 31 42 35 36 37 34 45 42 30 2D 59 4B 30
+20 20 00 00 80 CE 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/auron_yuna/spd/spd.c b/src/mainboard/google/auron_yuna/spd/spd.c
index 65fd31d..7aa7b79 100644
--- a/src/mainboard/google/auron_yuna/spd/spd.c
+++ b/src/mainboard/google/auron_yuna/spd/spd.c
@@ -123,8 +123,8 @@
memcpy(pei_data->spd_data[0][0],
((char *)CBFS_SUBHEADER(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. */
+ /* Index 0-3 are 4GB config with both CH0 and CH1.
+ * Index 4-7 are 2GB config with CH0 only. */
if (spd_index > 3)
pei_data->dimm_channel1_disabled = 3;
else
