mb/google/kahlee/variants/careena: override DRAM SPD table

override DRAM SPD and add new 4 DRAM:
Samsung (TH)	K4AAG165WA-BCTD
Hynix (TG)	H5ANAG6NCMR-XNC
Micron (TF)	MT40A1G16RC-062E:B
Samsung (TH)	K4AAG165WA-BCWE

BUG=b:139912383
BRANCH=master
TEST=emerge-grunt coreboot chromeos-bootimage
     extract spd.bin and confirm 4 new SPD was added.

Change-Id: Ie1b2c1bae5ffe9f3a6a6560348f6e1b117ffd457
Signed-off-by: Kevin Chiu <Kevin.Chiu@quantatw.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35149
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>

16 files changed, 36 insertions, 431 deletions

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/baseboard/spd/empty.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
deleted file mode 100644
index 0d22dd0cf0..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-#Empty SPD - placeholder file
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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/hynix-H5AN8G6NAFR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
deleted file mode 100644
index a32a0672fc..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# H5AN8G6NAFR-UH
-23 11 0C 03 45 21 00 08  00 60 00 03 02 03 00 00
-00 00 07 0D F8 0F 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 D6 0B E3
-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 AD 01 00 00 00 00 00  00 48 35 41 4E 38 47 36
-4E 41 46 52 2D 55 48 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 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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/hynix-H5AN8G6NCJR-VKC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
deleted file mode 100644
index 3d046a335e..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# H5AN8G6NCJR-VKC
-23 11 0C 03 45 21 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 87 2E
-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 AD 01 00 00 00 00 00  00 48 35 41 4E 38 47 36
-4E 43 4A 52 2D 56 4B 43  20 20 20 20 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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/hynix-H5ANAG6NAMR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
deleted file mode 100644
index 390940fc9e..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# hynix-H5ANAG6NAMR
-23 11 0C 03 85 21 00 08  00 60 00 03 01 03 00 00
-00 00 07 0D F8 0F 00 00  6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 A8 1B 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 B5  00 00 00 00 E7 D6 89 02
-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 AD 01 00 00 00 00 00  00 48 35 41 4E 41 47 36
-4E 41 4D 52 2D 55 48 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 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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/hynix-H5ANAG6NCMR-VKC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
deleted file mode 100644
index e75e4c12d9..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# Hynix H5ANAG6NCMR-VKC
-23 11 0C 03 85 21 91 08  00 60 00 03 01 03 00 00
-00 00 06 0D F8 3F 00 00  6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 A8 18 28  28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 0C 2B 2D 04
-16 35 23 0D 00 00 2C 0B  03 24 35 0C 03 2D 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 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 43 CE
-0F 11 20 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 EF 55
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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 4D 41 41 31 47 53
-36 43 4D 52 38 4E 2D 56  4B 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
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075-E.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075-E.spd.hex
deleted file mode 100644
index 231598b482..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075-E.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# MT40A1G16KNR-075:E
-23 11 0C 03 85 21 00 08  00 60 00 03 01 03 00 00
-00 00 06 0D F8 FF 01 00  6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 A8 18 28  28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 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 60 8D
-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 2C 00 00 00 00 00 00  00 4D 54 34 30 41 31 47
-31 36 4B 4E 52 2D 30 37  35 3A 45 20 20 31 80 2C
-45 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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/variants/baseboard/spd/micron-MT40A512M16JY-083E-B.spd.hex
deleted file mode 100644
index ee6a4a6a36..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E-B.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# MT40A512M16JY-083E:B
-23 11 0C 03 45 21 00 08  00 60 00 03 02 03 00 00
-00 00 07 0D F8 7F 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 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 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 D6 55 A7
-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 2C 00 00 00 00 00 00  00 4D 54 34 30 41 35 31
-32 4D 31 36 4A 59 2D 30  38 33 45 3A 42 32 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-MT40A512M16LY-075-E.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16LY-075-E.spd.hex
deleted file mode 100644
index 1b39e3efcd..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16LY-075-E.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# MT40A512M16LY-075:E
-23 11 0C 03 45 21 00 08  00 60 00 03 02 03 00 00
-00 00 06 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 60 5B
-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 35 31
-32 4D 31 36 4C 59 2D 30  37 35 3A 45 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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-MT40A512M16TB-062E-J.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16TB-062E-J.spd.hex
deleted file mode 100644
index 67640fe849..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16TB-062E-J.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# MT40A512M16TB-062E:J
-23 11 0C 03 45 21 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 30 53
-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 35 31
-32 4D 31 36 54 42 2D 30  36 32 45 3A 4A 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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-K4A8G165WB-BCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
deleted file mode 100644
index 36b85a2035..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# K4A8G165WB-BCRC
-23 11 0C 03 45 21 00 08  00 60 00 03 02 03 00 00
-00 00 07 0D F8 0F 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 D6 0B E3
-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 4D 34 37 31 41 35 32
-34 34 42 42 30 2D 43 52  43 20 20 20 20 00 80 CE
-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 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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-K4A8G165WC-BCTD.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WC-BCTD.spd.hex
deleted file mode 100644
index d03dc5b40a..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WC-BCTD.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# Samsung K4A8G165WC-BCTD
-23 11 0C 03 45 21 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 87 2E
-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 38 47 31 36
-35 57 43 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/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
deleted file mode 100644
index 53808ac592..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# K4AAG165WB-MCRC
-23 11 0C 03 85 21 00 08  00 60 00 03 01 03 00 00
-00 00 07 0D F8 0F 00 00  6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 A8 1B 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 B5  00 00 00 00 E7 D6 89 02
-0F 11 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 66 CB
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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 4D 34 37 31 41 31 4B
-34 34 42 4D 30 2D 43 52  43 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-MCTD.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCTD.spd.hex
deleted file mode 100644
index ede001a4d5..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCTD.spd.hex
+++ /dev/null
@@ -1,33 +0,0 @@
-# Samsung K4AAG165WB-MCTD
-23 11 0C 03 85 21 00 08  00 60 00 03 01 03 00 00
-00 00 06 0D F8 3F 00 00  6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 A8 18 28  28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 0C 2B 2D 04
-16 35 23 0D 00 00 2C 0B  03 24 35 0C 03 2D 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 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 D0 4E
-0F 11 20 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 EF 55
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00  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 4D 34 37 31 41 31 4B
-34 33 42 42 31 2D 43 54  44 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/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