From 55ccd5b873eca356a4f20163aa0231320508e0f7 Mon Sep 17 00:00:00 2001 From: Rob Barnes Date: Fri, 14 Aug 2020 15:34:24 -0600 Subject: 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 Change-Id: I0553858f83d3d1e90cf35bece108768f004a29a5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44480 Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- .../google/zork/variants/woomax/spd/Makefile.inc | 32 ++++++++++------------ .../zork/variants/woomax/spd/dram_id.generated.txt | 9 ++++++ .../zork/variants/woomax/spd/mem_parts_used.txt | 8 ++++++ 3 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt create mode 100644 src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt (limited to 'src/mainboard/google/zork/variants/woomax/spd') diff --git a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc index 8c60fe601d..e3120af4cf 100644 --- a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc +++ b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc @@ -1,18 +1,16 @@ -# 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!! -APCB_SOURCES = micron-MT40A512M16TB-062E-J_x1 # 0b00000 -APCB_SOURCES += hynix-H5AN8G6NCJR-XNC_x1 # 0b00001 -APCB_SOURCES += micron-MT40A1G16KD-062E-E_x1 # 0b00010 -APCB_SOURCES += samsung-K4AAG165WA-BCWE_x1 # 0b00011 -APCB_SOURCES += empty # 0b00100 -APCB_SOURCES += empty # 0b00101 -APCB_SOURCES += empty # 0b00110 -APCB_SOURCES += empty # 0b00111 -APCB_SOURCES += micron-MT40A512M16TB-062E-J_x2 # 0b01000 -APCB_SOURCES += hynix-H5AN8G6NCJR-XNC_x2 # 0b01001 -APCB_SOURCES += micron-MT40A1G16KD-062E-E_x2 # 0b01010 -APCB_SOURCES += samsung-K4AAG165WA-BCWE_x2 # 0b01011 -APCB_SOURCES += empty # 0b01100 -APCB_SOURCES += empty # 0b01101 -APCB_SOURCES += empty # 0b01110 -APCB_SOURCES += empty # 0b01111 +SPD_SOURCES = +SPD_SOURCES += ddr4-spd-1.hex # ID = 0(0b0000) Parts = MT40A512M16TB-062E:J +SPD_SOURCES += ddr4-spd-1.hex # ID = 1(0b0001) Parts = H5AN8G6NCJR-XNC +SPD_SOURCES += ddr4-spd-7.hex # ID = 2(0b0010) Parts = MT40A1G16KD-062E:E +SPD_SOURCES += ddr4-spd-7.hex # ID = 3(0b0011) Parts = K4AAG165WA-BCWE +SPD_SOURCES += ddr4-spd-empty.hex # ID = 4(0b0100) +SPD_SOURCES += ddr4-spd-empty.hex # ID = 5(0b0101) +SPD_SOURCES += ddr4-spd-empty.hex # ID = 6(0b0110) +SPD_SOURCES += ddr4-spd-empty.hex # ID = 7(0b0111) +SPD_SOURCES += ddr4-spd-1.hex # ID = 8(0b1000) Parts = MT40A512M16TB-062E:J +SPD_SOURCES += ddr4-spd-1.hex # ID = 9(0b1001) Parts = H5AN8G6NCJR-XNC +SPD_SOURCES += ddr4-spd-7.hex # ID = 10(0b1010) Parts = MT40A1G16KD-062E:E +SPD_SOURCES += ddr4-spd-7.hex # ID = 11(0b1011) Parts = K4AAG165WA-BCWE diff --git a/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt new file mode 100644 index 0000000000..5c2cda55f6 --- /dev/null +++ b/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt @@ -0,0 +1,9 @@ +DRAM Part Name ID to assign +MT40A512M16TB-062E:J 0 (0000) +H5AN8G6NCJR-XNC 1 (0001) +MT40A1G16KD-062E:E 2 (0010) +K4AAG165WA-BCWE 3 (0011) +MT40A512M16TB-062E:J 8 (1000) +H5AN8G6NCJR-XNC 9 (1001) +MT40A1G16KD-062E:E 10 (1010) +K4AAG165WA-BCWE 11 (1011) diff --git a/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt new file mode 100644 index 0000000000..1dccbac049 --- /dev/null +++ b/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt @@ -0,0 +1,8 @@ +MT40A512M16TB-062E:J, 0 +H5AN8G6NCJR-XNC, 1 +MT40A1G16KD-062E:E, 2 +K4AAG165WA-BCWE, 3 +MT40A512M16TB-062E:J, 8 +H5AN8G6NCJR-XNC, 9 +MT40A1G16KD-062E:E, 10 +K4AAG165WA-BCWE, 11 -- cgit v1.2.3