aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork/variants/vilboz
diff options
context:
space:
mode:
authorRob Barnes <robbarnes@google.com>2020-08-14 15:34:24 -0600
committerAaron Durbin <adurbin@chromium.org>2020-08-28 15:58:34 +0000
commit55ccd5b873eca356a4f20163aa0231320508e0f7 (patch)
treec08118264c1d94ef683993af81a8e86e7b4887dd /src/mainboard/google/zork/variants/vilboz
parent8da998c2b084235181b9b2cd2d4a7ac15a92c4a1 (diff)
mb/google/zork: Switch zork to use spd_tools
Switch all zork boards to use generated generic SPDs from spd_tools. HMAA1GS6CMR6N-VK is unused by Ezkinil, and all other boards, so it was removed. picasso/Makefile.inc was updated to populate the 2nd APCB channel based on APCB_POPULATE_2ND_CHANNEL. This removes the need to suffix spd entires with _x1/_x2. Command to generate files: $ find src/mainboard/google/zork/variants/ -maxdepth 1 -type d | grep -v '/$' | while read b; do n=$(basename ${b}); if [ "${n}" = "baseboard" ]; then continue fi go run util/spd_tools/ddr4/gen_part_id.go src/mainboard/google/zork/spd \ src/mainboard/google/zork/variants/${n}/spd \ src/mainboard/google/zork/variants/${n}/spd/mem_parts_used.txt done BUG=b:162939176 TEST=Boot ezkinil and dalboz check dmidecod -t17 Signed-off-by: Rob Barnes <robbarnes@google.com> Change-Id: I0553858f83d3d1e90cf35bece108768f004a29a5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44480 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/zork/variants/vilboz')
-rw-r--r--src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc35
-rw-r--r--src/mainboard/google/zork/variants/vilboz/spd/dram_id.generated.txt8
-rw-r--r--src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt7
3 files changed, 25 insertions, 25 deletions
diff --git a/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
index c9a91083d8..73285450ba 100644
--- a/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
@@ -1,26 +1,11 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+## SPDX-License-Identifier: GPL-2.0-or-later
+## This is an auto-generated file. Do not edit!!
-# Ordered List of APCB entries, up to 16.
-# Entries should match this pattern {NAME}_x{1,2}
-# There should be a matching SPD hex file in SPD_SOURCES_DIR
-# matching the pattern {NAME}.spd.hex
-# The _x{1,2} suffix denotes single or dual channel
-# TODO: Remove channel suffix when b:141434940 is fixed
-# Alternatively, generated APCBs stored at
-# CONFIG_APCB_BLOB_DIR/APCB_{NAME}.bin can be included.
-APCB_SOURCES = hynix-H5AN8G6NCJR-VKC_x1 # 0b0000
-APCB_SOURCES += hynix-H5ANAG6NCMR-VKC_x1 # 0b0001
-APCB_SOURCES += samsung-K4A8G165WC-BCWE_x1 # 0b0010
-APCB_SOURCES += hynix-H5AN8G6NDJR-XNC_x1 # 0b0011
-APCB_SOURCES += micron-MT40A512M16TB-062E-J_x1 # 0b0100
-APCB_SOURCES += samsung-K4AAG165WA-BCWE_x1 # 0b0101
-APCB_SOURCES += micron-MT40A1G16KD-062E-E_x1 # 0b0110
-APCB_SOURCES += empty # 0b0111
-APCB_SOURCES += empty # 0b1000
-APCB_SOURCES += empty # 0b1001
-APCB_SOURCES += empty # 0b1010
-APCB_SOURCES += empty # 0b1011
-APCB_SOURCES += empty # 0b1100
-APCB_SOURCES += empty # 0b1101
-APCB_SOURCES += empty # 0b1110
-APCB_SOURCES += empty # 0b1111
+SPD_SOURCES =
+SPD_SOURCES += ddr4-spd-3.hex # ID = 0(0b0000) Parts = H5AN8G6NCJR-VKC
+SPD_SOURCES += ddr4-spd-6.hex # ID = 1(0b0001) Parts = H5ANAG6NCMR-VKC
+SPD_SOURCES += ddr4-spd-1.hex # ID = 2(0b0010) Parts = K4A8G165WC-BCWE
+SPD_SOURCES += ddr4-spd-1.hex # ID = 3(0b0011) Parts = H5AN8G6NDJR-XNC
+SPD_SOURCES += ddr4-spd-1.hex # ID = 4(0b0100) Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += ddr4-spd-7.hex # ID = 5(0b0101) Parts = K4AAG165WA-BCWE
+SPD_SOURCES += ddr4-spd-7.hex # ID = 6(0b0110) Parts = MT40A1G16KD-062E:E
diff --git a/src/mainboard/google/zork/variants/vilboz/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/vilboz/spd/dram_id.generated.txt
new file mode 100644
index 0000000000..6eb4bf353e
--- /dev/null
+++ b/src/mainboard/google/zork/variants/vilboz/spd/dram_id.generated.txt
@@ -0,0 +1,8 @@
+DRAM Part Name ID to assign
+H5AN8G6NCJR-VKC 0 (0000)
+H5ANAG6NCMR-VKC 1 (0001)
+K4A8G165WC-BCWE 2 (0010)
+H5AN8G6NDJR-XNC 3 (0011)
+MT40A512M16TB-062E:J 4 (0100)
+K4AAG165WA-BCWE 5 (0101)
+MT40A1G16KD-062E:E 6 (0110)
diff --git a/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
new file mode 100644
index 0000000000..ac7b794b4b
--- /dev/null
+++ b/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
@@ -0,0 +1,7 @@
+H5AN8G6NCJR-VKC, 0
+H5ANAG6NCMR-VKC, 1
+K4A8G165WC-BCWE, 2
+H5AN8G6NDJR-XNC, 3
+MT40A512M16TB-062E:J, 4
+K4AAG165WA-BCWE, 5
+MT40A1G16KD-062E:E, 6