From afedc210ffdb4fc54f9276c0512c61202bd7bdcb Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Fri, 17 Sep 2021 20:25:37 +1000 Subject: mb/google/zork: Migrate zork to use SPD files under spd/ SPD files are being moved from the soc and mainboard directories to a centralised spd/ directory. This change migrates all zork variants to use this new location. The contents of the new SPDs are identical, only their file paths have changed. The variant Makefile.inc and dram_id.generated.txt files were generated using the part_id_gen tool. E.g. for dalboz: util/spd_tools/bin/part_id_gen \ PCO \ ddr4 \ src/mainboard/google/zork/variants/dalboz/spd \ src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt BUG=b:191776301 TEST=Check that each variant's coreboot.rom is the same with and without this change. Built using: abuild -p none -t google/zork -a -x --timeless Signed-off-by: Reka Norman Change-Id: I305a24f9345bab28ff35e317b6e7fd7efba22413 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57772 Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- .../google/zork/variants/dirinboz/Makefile.inc | 2 -- .../google/zork/variants/dirinboz/spd/Makefile.inc | 28 ++++++++++++---------- .../variants/dirinboz/spd/dram_id.generated.txt | 5 ++++ 3 files changed, 20 insertions(+), 15 deletions(-) (limited to 'src/mainboard/google/zork/variants/dirinboz') diff --git a/src/mainboard/google/zork/variants/dirinboz/Makefile.inc b/src/mainboard/google/zork/variants/dirinboz/Makefile.inc index 51d19fe9babb..87bc511877b7 100644 --- a/src/mainboard/google/zork/variants/dirinboz/Makefile.inc +++ b/src/mainboard/google/zork/variants/dirinboz/Makefile.inc @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -subdirs-y += ./spd - ramstage-y += gpio.c ramstage-y += variant.c diff --git a/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc index 6d8e7495ba7e..605e49da407d 100644 --- a/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc +++ b/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc @@ -1,15 +1,17 @@ -## SPDX-License-Identifier: GPL-2.0-or-later -## This is an auto-generated file. Do not edit!! +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen PCO ddr4 src/mainboard/google/zork/variants/dirinboz/spd src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt SPD_SOURCES = -SPD_SOURCES += ddr4-spd-9.hex # ID = 0(0b0000) Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE -SPD_SOURCES += ddr4-spd-empty.hex # ID = 1(0b0001) -SPD_SOURCES += ddr4-spd-3.hex # ID = 2(0b0010) Parts = K4A8G165WC-BCTD -SPD_SOURCES += ddr4-spd-empty.hex # ID = 3(0b0011) -SPD_SOURCES += ddr4-spd-1.hex # ID = 4(0b0100) Parts = K4A8G165WC-BCWE -SPD_SOURCES += ddr4-spd-1.hex # ID = 5(0b0101) Parts = H5AN8G6NDJR-XNC -SPD_SOURCES += ddr4-spd-2.hex # ID = 6(0b0110) Parts = H5ANAG6NCMR-XNC -SPD_SOURCES += ddr4-spd-1.hex # ID = 7(0b0111) Parts = MT40A512M16TB-062E:J -SPD_SOURCES += ddr4-spd-7.hex # ID = 8(0b1000) Parts = MT40A1G16KD-062E:E -SPD_SOURCES += ddr4-spd-8.hex # ID = 9(0b1001) Parts = K4AAG165WA-BCTD -SPD_SOURCES += ddr4-spd-7.hex # ID = 10(0b1010) Parts = K4AAG165WA-BCWE +SPD_SOURCES += spd/ddr4/set-0/spd-9.hex # ID = 0(0b0000) Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 1(0b0001) +SPD_SOURCES += spd/ddr4/set-0/spd-3.hex # ID = 2(0b0010) Parts = K4A8G165WC-BCTD +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 3(0b0011) +SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 4(0b0100) Parts = K4A8G165WC-BCWE +SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 5(0b0101) Parts = H5AN8G6NDJR-XNC +SPD_SOURCES += spd/ddr4/set-0/spd-2.hex # ID = 6(0b0110) Parts = H5ANAG6NCMR-XNC +SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 7(0b0111) Parts = MT40A512M16TB-062E:J +SPD_SOURCES += spd/ddr4/set-0/spd-7.hex # ID = 8(0b1000) Parts = MT40A1G16KD-062E:E +SPD_SOURCES += spd/ddr4/set-0/spd-8.hex # ID = 9(0b1001) Parts = K4AAG165WA-BCTD +SPD_SOURCES += spd/ddr4/set-0/spd-7.hex # ID = 10(0b1010) Parts = K4AAG165WA-BCWE diff --git a/src/mainboard/google/zork/variants/dirinboz/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/dirinboz/spd/dram_id.generated.txt index 9f9949cf87f0..f4e6597d3db1 100644 --- a/src/mainboard/google/zork/variants/dirinboz/spd/dram_id.generated.txt +++ b/src/mainboard/google/zork/variants/dirinboz/spd/dram_id.generated.txt @@ -1,3 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen PCO ddr4 src/mainboard/google/zork/variants/dirinboz/spd src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt + DRAM Part Name ID to assign K4A8G165WC-BCTD 2 (0010) K4A8G165WC-BCWE 4 (0100) -- cgit v1.2.3