From fe74092c4e802efbed76804fb43f0bd25a5721b2 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 22 Oct 2013 16:35:12 -0700 Subject: [PATCH] samus: Fix up memory SPD information The LPDDR3 memory is x32 and dual rank with 14 row bits. In addition the memory is actually elpida, even though they are owned by micron it is confusing to label it as such. And the ram strap options were inverted from what I expected so the memory table needs to be updated. Change-Id: Ia29a23e8140d884fb84f940806f041b40562aab9 Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/174121 Reviewed-by: Aaron Durbin (cherry picked from commit 0d63d36b8035165f95db798ed40488519e622a65) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6828 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/mainboard/google/samus/Makefile.inc | 9 +++++---- src/mainboard/google/samus/elpida_4Gb.spd.hex | 16 ++++++++++++++++ src/mainboard/google/samus/elpida_8Gb.spd.hex | 16 ++++++++++++++++ src/mainboard/google/samus/micron_4Gb.spd.hex | 16 ---------------- src/mainboard/google/samus/micron_8Gb.spd.hex | 16 ---------------- src/mainboard/google/samus/samsung_4Gb.spd.hex | 6 +++--- src/mainboard/google/samus/samsung_8Gb.spd.hex | 6 +++--- 7 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 src/mainboard/google/samus/elpida_4Gb.spd.hex create mode 100644 src/mainboard/google/samus/elpida_8Gb.spd.hex delete mode 100644 src/mainboard/google/samus/micron_4Gb.spd.hex delete mode 100644 src/mainboard/google/samus/micron_8Gb.spd.hex diff --git a/src/mainboard/google/samus/Makefile.inc b/src/mainboard/google/samus/Makefile.inc index 47cf9d6fd2..343bdf4dc6 100644 --- a/src/mainboard/google/samus/Makefile.inc +++ b/src/mainboard/google/samus/Makefile.inc @@ -28,13 +28,14 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c SPD_BIN = $(obj)/spd.bin # Order of names in SPD_SOURCES is important! +# { GPIO69, GPIO68, GPIO67 } SPD_SOURCES = empty # 0: { 0, 0, 0 } -SPD_SOURCES += empty # 1: { 0, 0, 1 } +SPD_SOURCES += elpida_4Gb # 1: { 0, 0, 1 } SPD_SOURCES += empty # 2: { 0, 1, 0 } -SPD_SOURCES += samsung_4Gb # 3: { 0, 1, 1 } -SPD_SOURCES += micron_4Gb # 4: { 1, 0, 0 } +SPD_SOURCES += elpida_8Gb # 3: { 0, 1, 1 } +SPD_SOURCES += empty # 4: { 1, 0, 0 } SPD_SOURCES += samsung_8Gb # 5: { 1, 0, 1 } -SPD_SOURCES += micron_8Gb # 6: { 1, 1, 0 } +SPD_SOURCES += samsung_4Gb # 6: { 1, 1, 0 } SPD_SOURCES += empty # 7: { 1, 1, 1 } SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.hex) diff --git a/src/mainboard/google/samus/elpida_4Gb.spd.hex b/src/mainboard/google/samus/elpida_4Gb.spd.hex new file mode 100644 index 0000000000..e73ba6201c --- /dev/null +++ b/src/mainboard/google/samus/elpida_4Gb.spd.hex @@ -0,0 +1,16 @@ +92 11 F1 03 04 11 02 0B 03 11 01 08 0A 00 FE 00 +69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 05 +00 00 00 00 00 00 00 00 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 38 31 33 32 41 33 4D 41 2D 47 44 2D 46 +20 20 32 2E 30 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 diff --git a/src/mainboard/google/samus/elpida_8Gb.spd.hex b/src/mainboard/google/samus/elpida_8Gb.spd.hex new file mode 100644 index 0000000000..997a29773e --- /dev/null +++ b/src/mainboard/google/samus/elpida_8Gb.spd.hex @@ -0,0 +1,16 @@ +92 11 F1 03 05 11 02 0B 03 11 01 08 0A 00 FE 00 +69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 05 +00 00 00 00 00 00 00 00 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 41 32 33 32 41 32 4D 41 2D 47 44 2D 46 +20 20 32 2E 30 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 diff --git a/src/mainboard/google/samus/micron_4Gb.spd.hex b/src/mainboard/google/samus/micron_4Gb.spd.hex deleted file mode 100644 index fff0786444..0000000000 --- a/src/mainboard/google/samus/micron_4Gb.spd.hex +++ /dev/null @@ -1,16 +0,0 @@ -92 11 F1 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 05 -00 00 00 00 00 00 00 00 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 80 2C 00 00 00 00 00 00 00 AD 75 -34 4B 54 46 32 35 36 36 34 48 5A 2D 31 47 36 45 -31 20 45 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/samus/micron_8Gb.spd.hex b/src/mainboard/google/samus/micron_8Gb.spd.hex deleted file mode 100644 index 5900ad66a2..0000000000 --- a/src/mainboard/google/samus/micron_8Gb.spd.hex +++ /dev/null @@ -1,16 +0,0 @@ -92 11 F1 03 04 19 02 0A 03 11 01 08 0A 00 FE 00 -69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 05 -00 00 00 00 00 00 00 00 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 80 2C 00 00 00 00 00 00 00 AD 75 -34 4B 54 46 32 35 36 36 34 48 5A 2D 31 47 36 45 -31 20 45 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/samus/samsung_4Gb.spd.hex b/src/mainboard/google/samus/samsung_4Gb.spd.hex index 4d3eba9141..882105097a 100644 --- a/src/mainboard/google/samus/samsung_4Gb.spd.hex +++ b/src/mainboard/google/samus/samsung_4Gb.spd.hex @@ -1,12 +1,12 @@ -92 11 F1 03 04 19 02 02 03 11 01 08 0A 00 FE 00 +92 11 F1 03 04 11 02 0B 03 11 01 08 0A 00 FE 00 69 78 69 3C 69 11 18 81 F0 0A 3C 3C 01 40 83 01 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 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 80 CE 01 00 00 00 00 00 00 6A 04 -4D 34 37 31 42 35 36 37 34 42 48 30 2D 59 4B 30 +00 00 00 00 00 80 CE 01 00 00 00 00 00 00 00 00 +4B 34 45 38 45 33 30 34 45 44 2D 45 47 43 45 20 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 diff --git a/src/mainboard/google/samus/samsung_8Gb.spd.hex b/src/mainboard/google/samus/samsung_8Gb.spd.hex index 85e2be4f03..d9294f375a 100644 --- a/src/mainboard/google/samus/samsung_8Gb.spd.hex +++ b/src/mainboard/google/samus/samsung_8Gb.spd.hex @@ -1,12 +1,12 @@ -92 11 F1 03 04 19 02 0A 03 11 01 08 0A 00 FE 00 +92 11 F1 03 05 11 02 0B 03 11 01 08 0A 00 FE 00 69 78 69 3C 69 11 18 81 F0 0A 3C 3C 01 40 83 01 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 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 80 CE 01 00 00 00 00 00 00 6A 04 -4D 34 37 31 42 35 36 37 34 42 48 30 2D 59 4B 30 +00 00 00 00 00 80 CE 01 00 00 00 00 00 00 00 00 +4B 34 45 36 45 33 30 34 45 44 2D 45 47 43 45 20 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