summaryrefslogtreecommitdiffstats
path: root/src/mainboard/google/zork/variants/berknip
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/berknip
parent8da998c2b084235181b9b2cd2d4a7ac15a92c4a1 (diff)
downloadcoreboot-55ccd5b873eca356a4f20163aa0231320508e0f7.tar.gz
coreboot-55ccd5b873eca356a4f20163aa0231320508e0f7.tar.bz2
coreboot-55ccd5b873eca356a4f20163aa0231320508e0f7.zip
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/berknip')
-rw-r--r--src/mainboard/google/zork/variants/berknip/spd/Makefile.inc37
-rw-r--r--src/mainboard/google/zork/variants/berknip/spd/dram_id.generated.txt10
-rw-r--r--src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt9
3 files changed, 31 insertions, 25 deletions
diff --git a/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc b/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
index f53e66294d0f..ae5b2e28e6a5 100644
--- a/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
@@ -1,26 +1,13 @@
-# 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
-# Alternatively, generated APCBs stored at
-# 3rdparty/blobs/mainboard/$(MAINBOARDDIR)/APCB_{NAME}.bin will be included.
-APCB_SOURCES = samsung-K4A8G165WC-BCTD_x2 # 0b0000
-APCB_SOURCES += samsung-K4A8G165WC-BCWE_x2 # 0b0001
-# b/149596178: We can't use dual channel channel until the PSP supports missing
-# channels.
-APCB_SOURCES += micron-MT40A512M16TB-062E-J_x2 # 0b0010
-APCB_SOURCES += hynix-H5AN8G6NDJR-XNC_x1 # 0b0011
-APCB_SOURCES += hynix-H5ANAG6NCMR-VKC_x2 # 0b0100
-APCB_SOURCES += samsung-K4A8G165WC-BCWE_x1 # 0b0101
-APCB_SOURCES += micron-MT40A1G16KD-062E-E_x2 # 0b0110
-APCB_SOURCES += hynix-H5ANAG6NCMR-XNC_x2 # 0b0111
-APCB_SOURCES += samsung-K4AAG165WA-BCWE_x2 # 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
+SPD_SOURCES =
+SPD_SOURCES += ddr4-spd-3.hex # ID = 0(0b0000) Parts = K4A8G165WC-BCTD
+SPD_SOURCES += ddr4-spd-1.hex # ID = 1(0b0001) Parts = K4A8G165WC-BCWE
+SPD_SOURCES += ddr4-spd-1.hex # ID = 2(0b0010) Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += ddr4-spd-1.hex # ID = 3(0b0011) Parts = H5AN8G6NDJR-XNC
+SPD_SOURCES += ddr4-spd-6.hex # ID = 4(0b0100) Parts = H5ANAG6NCMR-VKC
+SPD_SOURCES += ddr4-spd-1.hex # ID = 5(0b0101) Parts = K4A8G165WC-BCWE
+SPD_SOURCES += ddr4-spd-7.hex # ID = 6(0b0110) Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += ddr4-spd-2.hex # ID = 7(0b0111) Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += ddr4-spd-7.hex # ID = 8(0b1000) Parts = K4AAG165WA-BCWE
diff --git a/src/mainboard/google/zork/variants/berknip/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/berknip/spd/dram_id.generated.txt
new file mode 100644
index 000000000000..32b598174839
--- /dev/null
+++ b/src/mainboard/google/zork/variants/berknip/spd/dram_id.generated.txt
@@ -0,0 +1,10 @@
+DRAM Part Name ID to assign
+K4A8G165WC-BCTD 0 (0000)
+K4A8G165WC-BCWE 1 (0001)
+MT40A512M16TB-062E:J 2 (0010)
+H5AN8G6NDJR-XNC 3 (0011)
+H5ANAG6NCMR-VKC 4 (0100)
+K4A8G165WC-BCWE 5 (0101)
+MT40A1G16KD-062E:E 6 (0110)
+H5ANAG6NCMR-XNC 7 (0111)
+K4AAG165WA-BCWE 8 (1000)
diff --git a/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
new file mode 100644
index 000000000000..1c88e23a4271
--- /dev/null
+++ b/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
@@ -0,0 +1,9 @@
+K4A8G165WC-BCTD, 0
+K4A8G165WC-BCWE, 1
+MT40A512M16TB-062E:J, 2
+H5AN8G6NDJR-XNC, 3
+H5ANAG6NCMR-VKC, 4
+K4A8G165WC-BCWE, 5
+MT40A1G16KD-062E:E, 6
+H5ANAG6NCMR-XNC, 7
+K4AAG165WA-BCWE, 8