Change in coreboot[master]: google/cyan: Add 2nd source memory 2-channel 4G (Micro/Samsung)

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/21171

Change subject: google/cyan: Add 2nd source memory 2-channel 4G (Micro/Samsung)
......................................................................

google/cyan: Add 2nd source memory 2-channel 4G (Micro/Samsung)

Cherry-pick from Chromium commit 7f0cdf0.

Cyan board add 4G DDR3L 2nd source memory (Micro/Samsung)

Original-Change-Id: I12f82082d8227e61a97ce0a001d7d2b1f6613e06
Original-Signed-off-by: T.H. Lin 
Original-Reviewed-by: Shawn N

Change-Id: Ieca7201346414d7a962f9619dbe846c67c0f02d6
Signed-off-by: Matt DeVillier 
---
M src/mainboard/google/cyan/spd/Makefile.inc
M src/mainboard/google/cyan/spd/spd.c
2 files changed, 12 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/21171/1

diff --git a/src/mainboard/google/cyan/spd/Makefile.inc b/src/mainboard/google/cyan/spd/Makefile.inc
index 543ac73..f596086 100644
--- a/src/mainboard/google/cyan/spd/Makefile.inc
+++ b/src/mainboard/google/cyan/spd/Makefile.inc
@@ -22,8 +22,8 @@
 SPD_SOURCES += hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR
 SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0
 SPD_SOURCES += hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR
-SPD_SOURCES += empty
-SPD_SOURCES += empty
+SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0
+SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107
 SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0
 SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107

diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c
index 5b7dc73..cbe8ceb 100644
--- a/src/mainboard/google/cyan/spd/spd.c
+++ b/src/mainboard/google/cyan/spd/spd.c
@@ -33,10 +33,13 @@
  * 0b0001 - 4GiB total - 2 x 2GiB Hynix  H5TC4G63CFR-PBA 1600MHz
  * 0b0010 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz
  * 0b0011 - 2GiB total - 1 x 2GiB Hynix  H5TC4G63CFR-PBA 1600MHz
+ * 0b0100 - 4GiB total - 2 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz
+ * 0b0101 - 4GiB total - 2 x 2GiB Micro MT41K256M16TW-107 1600MHz
  * 0b0110 - 2GiB total - 1 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz
  * 0b0111 - 2GiB total - 1 x 2GiB Micro MT41K256M16TW-107 1600MHz
  */
-static const uint32_t dual_channel_config = (1 << 0) | (1 << 1);
+static const uint32_t dual_channel_config = (1 << 0) | (1 << 1)
+			| (1 << 4) | (1 << 5);

static void *get_spd_pointer(char *spd_file_content, int total_spds, int *dual)
 {
@@ -72,6 +75,12 @@
    case 3:
    	printk(BIOS_DEBUG, "2GiB Hynix  H5TC4G63CFR-PBA 1600MHz\n");
    	break;
+	case 4:
+		printk(BIOS_DEBUG, "4GiB Samsung K4B4G1646E-BYK0 1600MHz\n");
+		break;
+	case 5:
+		printk(BIOS_DEBUG, "4GiB Micro MT41K256M16TW-107 1600MHz\n");
+		break;
    case 6:
    	printk(BIOS_DEBUG, "2GiB Samsung K4B4G1646E-BYK0 1600MHz\n");
    	break;