samus: Add new memory type

Add a new memory type for the next build, and rename the existing
ones to drop the Gb suffix.

BUG=chrome-os-partner:33924
BRANCH=samus
TEST=build and boot on samus

Change-Id: Iedcd3823aa80c93fc2aadbc486d74b40c9bd4279
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: bcc9827965182a7d0d5325189d55eb76f5c2f0e7
Original-Change-Id: I47d2b7e58f51f3ee00cd7797da3f8353f509f8b5
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/230769
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9278
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

9 files changed, 24 insertions, 6 deletions

diff --git a/src/mainboard/google/samus/spd/Makefile.inc b/src/mainboard/google/samus/spd/Makefile.inc
index be6740dd4b..79d5aedeb7 100644
--- a/src/mainboard/google/samus/spd/Makefile.inc
+++ b/src/mainboard/google/samus/spd/Makefile.inc
@@ -28,16 +28,16 @@ SPD_SOURCES += empty            # 0b0010
 SPD_SOURCES += empty            # 0b0011
 SPD_SOURCES += empty            # 0b0100
 SPD_SOURCES += empty            # 0b0101
-SPD_SOURCES += samsung_4Gb      # 0b0110
+SPD_SOURCES += samsung_4        # 0b0110
 SPD_SOURCES += empty            # 0b0111
-SPD_SOURCES += hynix_4Gb        # 0b1000
+SPD_SOURCES += hynix_4          # 0b1000
 SPD_SOURCES += empty            # 0b1001
-SPD_SOURCES += samsung_8Gb      # 0b1010
+SPD_SOURCES += samsung_8        # 0b1010
 SPD_SOURCES += empty            # 0b1011
-SPD_SOURCES += hynix_8Gb        # 0b1100
-SPD_SOURCES += hynix_16Gb       # 0b1101
+SPD_SOURCES += hynix_8          # 0b1100
+SPD_SOURCES += hynix_16         # 0b1101
 SPD_SOURCES += empty            # 0b1110
-SPD_SOURCES += empty            # 0b1111
+SPD_SOURCES += elpida_16        # 0b1111
 
 SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
 
diff --git a/src/mainboard/google/samus/spd/elpida_16.spd.hex b/src/mainboard/google/samus/spd/elpida_16.spd.hex
new file mode 100644
index 0000000000..5594164816
--- /dev/null
+++ b/src/mainboard/google/samus/spd/elpida_16.spd.hex
@@ -0,0 +1,18 @@
+# Elpida EDFB232A1MA
+# banks 8, ranks 2, rows 15, columns 11, density 8192 Mb, x16
+91 20 F1 03 05 1A 05 0A 03 11 01 08 0A 00 50 01
+78 78 90 50 90 11 50 E0 90 06 3C 3C 01 90 00 00
+00 80 00 00 00 00 00 A8 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 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 02 FE 00 00 00 00 00 00 00 00 00
+45 44 46 42 32 33 32 41 31 4D 41 2D 47 44 2D 46
+00 00 00 00 02 FE 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 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/samus/spd/elpida_4Gb.spd.hex b/src/mainboard/google/samus/spd/elpida_4.spd.hex
index e73ba6201c..e73ba6201c 100644
--- a/src/mainboard/google/samus/spd/elpida_4Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/elpida_4.spd.hex
diff --git a/src/mainboard/google/samus/spd/elpida_8Gb.spd.hex b/src/mainboard/google/samus/spd/elpida_8.spd.hex
index b790943fdc..b790943fdc 100644
--- a/src/mainboard/google/samus/spd/elpida_8Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/elpida_8.spd.hex
diff --git a/src/mainboard/google/samus/spd/hynix_16Gb.spd.hex b/src/mainboard/google/samus/spd/hynix_16.spd.hex
index a03d4ed464..a03d4ed464 100644
--- a/src/mainboard/google/samus/spd/hynix_16Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/hynix_16.spd.hex
diff --git a/src/mainboard/google/samus/spd/hynix_4Gb.spd.hex b/src/mainboard/google/samus/spd/hynix_4.spd.hex
index 93e65a70dd..93e65a70dd 100644
--- a/src/mainboard/google/samus/spd/hynix_4Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/hynix_4.spd.hex
diff --git a/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex b/src/mainboard/google/samus/spd/hynix_8.spd.hex
index 15737e443a..15737e443a 100644
--- a/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/hynix_8.spd.hex
diff --git a/src/mainboard/google/samus/spd/samsung_4Gb.spd.hex b/src/mainboard/google/samus/spd/samsung_4.spd.hex
index 4b82a3a6c7..4b82a3a6c7 100644
--- a/src/mainboard/google/samus/spd/samsung_4Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/samsung_4.spd.hex
diff --git a/src/mainboard/google/samus/spd/samsung_8Gb.spd.hex b/src/mainboard/google/samus/spd/samsung_8.spd.hex
index c0a8fca4ea..c0a8fca4ea 100644
--- a/src/mainboard/google/samus/spd/samsung_8Gb.spd.hex
+++ b/src/mainboard/google/samus/spd/samsung_8.spd.hex