20 files changed, 168 insertions, 2 deletions
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex b/src/mainboard/google/kahlee/spd/empty.spd.hex
index 0d22dd0cf0..0d22dd0cf0 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
+++ b/src/mainboard/google/kahlee/spd/empty.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex b/src/mainboard/google/kahlee/spd/hynix-H5AN8G6NAFR-UH.spd.hex
index a32a0672fc..a32a0672fc 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
+++ b/src/mainboard/google/kahlee/spd/hynix-H5AN8G6NAFR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NCJR-VKC.spd.hex b/src/mainboard/google/kahlee/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
index 3d046a335e..3d046a335e 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
+++ b/src/mainboard/google/kahlee/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NAMR-UH.spd.hex
index 390940fc9e..390940fc9e 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
+++ b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NAMR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NCMR-VKC.spd.hex b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
index e75e4c12d9..e75e4c12d9 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
+++ b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
diff --git a/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-XNC.spd.hex b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-XNC.spd.hex
new file mode 100644
index 0000000000..b20c17ed62
--- /dev/null
+++ b/src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-XNC.spd.hex
@@ -0,0 +1,33 @@
+# Hynix H5ANAG6NCMR-XNC
+23 11 0C 03 85 21 91 08  00 60 00 03 01 03 00 00
+00 00 05 0D F8 FF 02 00  6E 6E 6E 11 00 6E F0 0A
+20 08 00 05 00 A8 14 28  28 00 78 00 14 3C 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 16 36 0B 35
+16 36 0B 35 00 00 16 36  0B 35 16 36 0B 35 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 9C 00  00 00 00 00 E7 00 C0 6E
+0F 01 1F 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 00 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 7D 21
+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
+80 AD 01 00 00 00 00 00  00 48 35 41 4E 41 47 36
+4E 43 4D 52 2D 58 4E 43  20 20 20 20 20 00 80 AD
+FF 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 DD 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  00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+\ No newline at end of file
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075-E.spd.hex b/src/mainboard/google/kahlee/spd/micron-MT40A1G16KNR-075-E.spd.hex
index 231598b482..231598b482 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075-E.spd.hex
+++ b/src/mainboard/google/kahlee/spd/micron-MT40A1G16KNR-075-E.spd.hex
diff --git a/src/mainboard/google/kahlee/spd/micron-MT40A1G16RC-062E-B.spd.hex b/src/mainboard/google/kahlee/spd/micron-MT40A1G16RC-062E-B.spd.hex
new file mode 100644
index 0000000000..52a4a1bcdd
--- /dev/null
+++ b/src/mainboard/google/kahlee/spd/micron-MT40A1G16RC-062E-B.spd.hex
@@ -0,0 +1,33 @@
+# MT40A1G16RC-062E:B
+23 11 0C 03 46 29 00 08  00 60 00 03 02 03 00 00
+00 00 05 0D F8 FF 2B 00  6E 6E 6E 11 00 6E F0 0A
+20 08 00 05 00 F0 2B 34  28 00 78 00 14 3C 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 16 36 0B 35
+16 36 0B 35 00 00 16 36  0B 35 16 36 0B 35 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 9C B5  00 00 00 00 E7 00 40 36
+0F 01 02 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 00 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 C0 E2
+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
+80 2C 00 00 00 00 00 00  00 4D 54 34 30 41 31 47
+31 36 52 43 2D 30 36 32  45 3A 42 20 20 31 80 2C
+42 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 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/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E-B.spd.hex b/src/mainboard/google/kahlee/spd/micron-MT40A512M16JY-083E-B.spd.hex
index ee6a4a6a36..ee6a4a6a36 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E-B.spd.hex
+++ b/src/mainboard/google/kahlee/spd/micron-MT40A512M16JY-083E-B.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16LY-075-E.spd.hex b/src/mainboard/google/kahlee/spd/micron-MT40A512M16LY-075-E.spd.hex
index 1b39e3efcd..1b39e3efcd 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16LY-075-E.spd.hex
+++ b/src/mainboard/google/kahlee/spd/micron-MT40A512M16LY-075-E.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16TB-062E-J.spd.hex b/src/mainboard/google/kahlee/spd/micron-MT40A512M16TB-062E-J.spd.hex
index 67640fe849..67640fe849 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16TB-062E-J.spd.hex
+++ b/src/mainboard/google/kahlee/spd/micron-MT40A512M16TB-062E-J.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4A8G165WB-BCRC.spd.hex
index 36b85a2035..36b85a2035 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
+++ b/src/mainboard/google/kahlee/spd/samsung-K4A8G165WB-BCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WC-BCTD.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4A8G165WC-BCTD.spd.hex
index d03dc5b40a..d03dc5b40a 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WC-BCTD.spd.hex
+++ b/src/mainboard/google/kahlee/spd/samsung-K4A8G165WC-BCTD.spd.hex
diff --git a/src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCTD.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCTD.spd.hex
new file mode 100644
index 0000000000..f747f7c34e
--- /dev/null
+++ b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCTD.spd.hex
@@ -0,0 +1,33 @@
+# Samsung K4AAG165WA-BCTD
+23 11 0C 03 46 29 00 08  00 60 00 03 02 03 00 00
+00 00 06 0D F8 3F 00 00  6E 6E 6E 11 00 6E F0 0A
+20 08 00 05 00 F0 2B 34  28 00 78 00 14 3C 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 16 36 0B 35
+16 36 0B 35 00 00 16 36  0B 35 16 36 0B 35 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 9C B5  00 00 00 00 E7 00 F7 4B
+0F 11 02 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 00 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 DB 08
+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
+80 CE 00 00 00 00 00 00  00 4B 34 41 41 47 31 36
+35 57 41 2D 42 43 54 44  20 20 20 20 20 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 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/kahlee/spd/samsung-K4AAG165WA-BCWE.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCWE.spd.hex
new file mode 100644
index 0000000000..390e5a5417
--- /dev/null
+++ b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCWE.spd.hex
@@ -0,0 +1,33 @@
+# Samsung K4AAG165WA-BCWE
+23 11 0C 03 46 29 00 08  00 60 00 03 02 03 00 00
+00 00 05 0D F8 FF 01 00  6E 6E 6E 11 00 6E F0 0A
+20 08 00 05 00 F0 2B 34  28 00 78 00 14 3C 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 16 36 0B 35
+16 36 0B 35 00 00 16 36  0B 35 16 36 0B 35 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 9C B5  00 00 00 00 E7 00 E8 F5
+0F 11 02 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 00 00 00
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 DB 08
+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
+80 CE 00 00 00 00 00 00  00 4B 34 41 41 47 31 36
+35 57 41 2D 42 43 57 45  20 20 20 20 20 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 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/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCRC.spd.hex
index 53808ac592..53808ac592 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
+++ b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCTD.spd.hex b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCTD.spd.hex
index ede001a4d5..ede001a4d5 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCTD.spd.hex
+++ b/src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCTD.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
index 213fc051f8..b6a57b73ba 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 ##
 
-LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/baseboard/spd/$(f).spd.hex)
+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
 
 SPD_SOURCES =  hynix-H5AN8G6NAFR-UH		# 0b0000
 SPD_SOURCES += hynix-H5ANAG6NAMR-UH		# 0b0001
diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc
index 0579e1899f..17ea78eee0 100644
--- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 
-subdirs-y += ../baseboard/spd
+subdirs-y += ./spd
 
 romstage-y += ../baseboard/romstage.c
 
diff --git a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc
new file mode 100644
index 0000000000..e764bafb27
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc
@@ -0,0 +1,34 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2014 Google Inc.
+## Copyright (C) 2015 Intel Corporation.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
+
+SPD_SOURCES =  hynix-H5AN8G6NAFR-UH		# 0b0000
+SPD_SOURCES += hynix-H5ANAG6NAMR-UH		# 0b0001
+SPD_SOURCES += micron-MT40A512M16JY-083E-B	# 0b0010
+SPD_SOURCES += micron-MT40A1G16KNR-075-E	# 0b0011
+SPD_SOURCES += samsung-K4A8G165WB-BCRC		# 0b0100
+SPD_SOURCES += samsung-K4AAG165WB-MCRC		# 0b0101
+SPD_SOURCES += micron-MT40A512M16LY-075-E	# 0b0110
+SPD_SOURCES += hynix-H5ANAG6NCMR-VKC		# 0b0111
+SPD_SOURCES += hynix-H5AN8G6NCJR-VKC		# 0b1000
+SPD_SOURCES += samsung-K4A8G165WC-BCTD		# 0b1001
+SPD_SOURCES += samsung-K4AAG165WB-MCTD		# 0b1010
+SPD_SOURCES += micron-MT40A512M16TB-062E-J	# 0b1011
+SPD_SOURCES += samsung-K4AAG165WA-BCTD		# 0b1100
+SPD_SOURCES += hynix-H5ANAG6NCMR-XNC		# 0b1101
+SPD_SOURCES += micron-MT40A1G16RC-062E-B	# 0b1110
+SPD_SOURCES += samsung-K4AAG165WA-BCWE		# 0b1111