mb/google/volteer: Migrate volteer 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 volteer 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 voema:

util/spd_tools/bin/part_id_gen \
  TGL \
  lp4x \
  src/mainboard/google/volteer/variants/voema/memory \
  src/mainboard/google/volteer/variants/voema/memory/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/volteer -a -x --timeless

Change-Id: Ibd4f42fd421bfa58354b532fe7a67ee59dac5e1d
Signed-off-by: Reka Norman <rekanorman@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57695
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

39 files changed, 226 insertions, 98 deletions

diff --git a/src/mainboard/google/volteer/spd/Makefile.inc b/src/mainboard/google/volteer/spd/Makefile.inc
index eb8e6ff355..be4d98bd1d 100644
--- a/src/mainboard/google/volteer/spd/Makefile.inc
+++ b/src/mainboard/google/volteer/spd/Makefile.inc
@@ -2,10 +2,5 @@
 ##
 
 ifneq ($(SPD_SOURCES),)
-ifeq ($(SPD_SOURCE_PATH),)
-SPD_SOURCE_PATH := src/soc/intel/tigerlake/spd
-endif
-
-LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), $(SPD_SOURCE_PATH)/$(f))
-
+LIB_SPD_DEPS := $(SPD_SOURCES)
 endif
diff --git a/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc b/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc
index 809572d790..3e2297a978 100644
--- a/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc
@@ -1,8 +1,10 @@
-## 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 TGL ddr4 src/mainboard/google/volteer/variants/chronicler/memory src/mainboard/google/volteer/variants/chronicler/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-2.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCMR-XNC
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 1(0b0001)  Parts = MT40A1G16KD-062E:E, K4AAG165WA-BCWE
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 2(0b0010)  Parts = H5AN8G6NDJR-XNC, MT40A512M16TB-062E:J, MT40A512M16TB-062E:R, K4A8G165WC-BCWE
-SPD_SOURCES += ddr4-spd-9.hex      # ID = 3(0b0011)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 1(0b0001)  Parts = MT40A1G16KD-062E:E, K4AAG165WA-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = H5AN8G6NDJR-XNC, MT40A512M16TB-062E:J, MT40A512M16TB-062E:R, K4A8G165WC-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 3(0b0011)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
diff --git a/src/mainboard/google/volteer/variants/chronicler/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/chronicler/memory/dram_id.generated.txt
index bc65b38b33..c89e74d9a6 100644
--- a/src/mainboard/google/volteer/variants/chronicler/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/chronicler/memory/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 TGL ddr4 src/mainboard/google/volteer/variants/chronicler/memory src/mainboard/google/volteer/variants/chronicler/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H5ANAG6NCMR-XNC                0 (0000)
 MT40A1G16KD-062E:E             1 (0001)
diff --git a/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc b/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc
index 7b9a85e0d6..8cd4a4cf74 100644
--- a/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/collis/memory src/mainboard/google/volteer/variants/collis/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53D512M64D4NW-046 WT:F, H9HCNNNCRMBLPR-NEE
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53D1G64D4NW-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNFBMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53D512M64D4NW-046 WT:F, H9HCNNNCRMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53D1G64D4NW-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNFBMBLPR-NEE
diff --git a/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt
index 413301e52c..cf5730c81b 100644
--- a/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/collis/memory/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 TGL lp4x src/mainboard/google/volteer/variants/collis/memory src/mainboard/google/volteer/variants/collis/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53D512M64D4NW-046 WT:F       0 (0000)
 H9HCNNNCRMBLPR-NEE             0 (0000)
diff --git a/src/mainboard/google/volteer/variants/copano/memory/Makefile.inc b/src/mainboard/google/volteer/variants/copano/memory/Makefile.inc
index 7b9a85e0d6..a09b839788 100644
--- a/src/mainboard/google/volteer/variants/copano/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/copano/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/copano/memory src/mainboard/google/volteer/variants/copano/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53D512M64D4NW-046 WT:F, H9HCNNNCRMBLPR-NEE
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53D1G64D4NW-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNFBMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53D512M64D4NW-046 WT:F, H9HCNNNCRMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53D1G64D4NW-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNFBMBLPR-NEE
diff --git a/src/mainboard/google/volteer/variants/copano/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/copano/memory/dram_id.generated.txt
index 413301e52c..c6d8ecafa8 100644
--- a/src/mainboard/google/volteer/variants/copano/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/copano/memory/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 TGL lp4x src/mainboard/google/volteer/variants/copano/memory src/mainboard/google/volteer/variants/copano/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53D512M64D4NW-046 WT:F       0 (0000)
 H9HCNNNCRMBLPR-NEE             0 (0000)
diff --git a/src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc b/src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc
index c0e2fffb6b..1f9c8e837d 100644
--- a/src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/delbin/memory src/mainboard/google/volteer/variants/delbin/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
diff --git a/src/mainboard/google/volteer/variants/delbin/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/delbin/memory/dram_id.generated.txt
index b5bd3ef2b6..56b11ad7ae 100644
--- a/src/mainboard/google/volteer/variants/delbin/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/delbin/memory/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 TGL lp4x src/mainboard/google/volteer/variants/delbin/memory src/mainboard/google/volteer/variants/delbin/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 MT53E1G32D2NP-046 WT:A         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc b/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc
index c0e2fffb6b..93b5773214 100644
--- a/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
diff --git a/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt
index b5bd3ef2b6..7ef3a1d887 100644
--- a/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/drobit/memory/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 TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 MT53E1G32D2NP-046 WT:A         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc b/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc
index 7fedb42898..1749b57fe8 100644
--- a/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc
@@ -1,9 +1,11 @@
-## 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 TGL ddr4 src/mainboard/google/volteer/variants/eldrid/memory src/mainboard/google/volteer/variants/eldrid/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 0(0b0000)  Parts = H5AN8G6NDJR-XNC, K4A8G165WC-BCWE, MT40A512M16TB-062E:R
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 1(0b0001)  Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-2.hex      # ID = 2(0b0010)  Parts = H5ANAG6NCMR-XNC
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 3(0b0011)  Parts = K4AAG165WA-BCWE, MT40A1G16KD-062E:E
-SPD_SOURCES += ddr4-spd-9.hex      # ID = 4(0b0100)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = H5AN8G6NDJR-XNC, K4A8G165WC-BCWE, MT40A512M16TB-062E:R
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 1(0b0001)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 2(0b0010)  Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 3(0b0011)  Parts = K4AAG165WA-BCWE, MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 4(0b0100)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/eldrid/memory/dram_id.generated.txt
index 4b316d0094..b8de9fa2c4 100644
--- a/src/mainboard/google/volteer/variants/eldrid/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/eldrid/memory/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 TGL ddr4 src/mainboard/google/volteer/variants/eldrid/memory src/mainboard/google/volteer/variants/eldrid/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 H5AN8G6NDJR-XNC                0 (0000)
 MT40A512M16TB-062E:J           1 (0001)
diff --git a/src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc b/src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc
index a70a7d90bd..c342cdc50b 100644
--- a/src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc
@@ -1,8 +1,10 @@
-## 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 TGL ddr4 src/mainboard/google/volteer/variants/elemi/memory src/mainboard/google/volteer/variants/elemi/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-2.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCMR-XNC
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 1(0b0001)  Parts = MT40A1G16KD-062E:E, K4AAG165WA-BCWE
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 2(0b0010)  Parts = H5AN8G6NDJR-XNC, MT40A512M16TB-062E:J, K4A8G165WC-BCWE, MT40A512M16TB-062E:R
-SPD_SOURCES += ddr4-spd-9.hex      # ID = 3(0b0011)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 1(0b0001)  Parts = MT40A1G16KD-062E:E, K4AAG165WA-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = H5AN8G6NDJR-XNC, MT40A512M16TB-062E:J, K4A8G165WC-BCWE, MT40A512M16TB-062E:R
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 3(0b0011)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
diff --git a/src/mainboard/google/volteer/variants/elemi/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/elemi/memory/dram_id.generated.txt
index 2e12affc3c..9b2b158038 100644
--- a/src/mainboard/google/volteer/variants/elemi/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/elemi/memory/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 TGL ddr4 src/mainboard/google/volteer/variants/elemi/memory src/mainboard/google/volteer/variants/elemi/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 H5ANAG6NCMR-XNC                0 (0000)
 MT40A1G16KD-062E:E             1 (0001)
diff --git a/src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc
index d4c7d0c6ca..80bd7f57e9 100644
--- a/src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc
@@ -1,6 +1,8 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/halvor/memory src/mainboard/google/volteer/variants/halvor/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HKNNNCRMBVAR-NEH
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G64D4SQ-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = H9HKNNNCRMBVAR-NEH
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G64D4SQ-046 WT:A
diff --git a/src/mainboard/google/volteer/variants/halvor/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/halvor/memory/dram_id.generated.txt
index 188b23a39c..d2bfdf921f 100644
--- a/src/mainboard/google/volteer/variants/halvor/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/halvor/memory/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 TGL lp4x src/mainboard/google/volteer/variants/halvor/memory src/mainboard/google/volteer/variants/halvor/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 H9HKNNNCRMBVAR-NEH             0 (0000)
 MT53E1G64D4SQ-046 WT:A         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc b/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc
index b7e69440fd..6431ba2f53 100644
--- a/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc
@@ -1,5 +1,7 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/lillipup/memory src/mainboard/google/volteer/variants/lillipup/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F
diff --git a/src/mainboard/google/volteer/variants/lillipup/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/lillipup/memory/dram_id.generated.txt
index dc87e04ace..62798c184d 100644
--- a/src/mainboard/google/volteer/variants/lillipup/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/lillipup/memory/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 TGL lp4x src/mainboard/google/volteer/variants/lillipup/memory src/mainboard/google/volteer/variants/lillipup/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCR                0 (0000)
 H9HCNNNBKMMLXR-NEE             0 (0000)
diff --git a/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc
index 8c96e06187..bfacd0a166 100644
--- a/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc
@@ -1,5 +1,7 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/lindar/memory src/mainboard/google/volteer/variants/lindar/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL
diff --git a/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt
index 9bf0bd9af0..648db629f7 100644
--- a/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt
@@ -1,2 +1,7 @@
+# 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 TGL lp4x src/mainboard/google/volteer/variants/lindar/memory src/mainboard/google/volteer/variants/lindar/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCL                0 (0000)
diff --git a/src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc
index 8c96e06187..3bd4cfdcf4 100644
--- a/src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc
@@ -1,5 +1,7 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/malefor/memory src/mainboard/google/volteer/variants/malefor/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL
diff --git a/src/mainboard/google/volteer/variants/malefor/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/malefor/memory/dram_id.generated.txt
index 9bf0bd9af0..14594e58ba 100644
--- a/src/mainboard/google/volteer/variants/malefor/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/malefor/memory/dram_id.generated.txt
@@ -1,2 +1,7 @@
+# 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 TGL lp4x src/mainboard/google/volteer/variants/malefor/memory src/mainboard/google/volteer/variants/malefor/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCL                0 (0000)
diff --git a/src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc b/src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc
index 3c8ea4876f..a4234151de 100644
--- a/src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc
@@ -1,6 +1,8 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/terrador/memory src/mainboard/google/volteer/variants/terrador/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E
diff --git a/src/mainboard/google/volteer/variants/terrador/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/terrador/memory/dram_id.generated.txt
index 02e7443467..be3d741013 100644
--- a/src/mainboard/google/volteer/variants/terrador/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/terrador/memory/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 TGL lp4x src/mainboard/google/volteer/variants/terrador/memory src/mainboard/google/volteer/variants/terrador/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M64D4NW-046 WT:E       0 (0000)
 MT53E1G64D8NW-046 WT:E         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/todor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/todor/memory/Makefile.inc
index 3c8ea4876f..f90c0e6a7a 100644
--- a/src/mainboard/google/volteer/variants/todor/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/todor/memory/Makefile.inc
@@ -1,6 +1,8 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/todor/memory src/mainboard/google/volteer/variants/todor/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E
diff --git a/src/mainboard/google/volteer/variants/todor/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/todor/memory/dram_id.generated.txt
index 02e7443467..b4510108cd 100644
--- a/src/mainboard/google/volteer/variants/todor/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/todor/memory/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 TGL lp4x src/mainboard/google/volteer/variants/todor/memory src/mainboard/google/volteer/variants/todor/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M64D4NW-046 WT:E       0 (0000)
 MT53E1G64D8NW-046 WT:E         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc b/src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc
index f40fba6751..1a12c1e675 100644
--- a/src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/trondo/memory src/mainboard/google/volteer/variants/trondo/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/volteer/variants/trondo/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/trondo/memory/dram_id.generated.txt
index 8d472df850..00b36c01b2 100644
--- a/src/mainboard/google/volteer/variants/trondo/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/trondo/memory/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 TGL lp4x src/mainboard/google/volteer/variants/trondo/memory src/mainboard/google/volteer/variants/trondo/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 H9HCNNNBKMMLXR-NEE             0 (0000)
diff --git a/src/mainboard/google/volteer/variants/voema/memory/Makefile.inc b/src/mainboard/google/volteer/variants/voema/memory/Makefile.inc
index 7b69aa4504..a2c2939f1f 100644
--- a/src/mainboard/google/volteer/variants/voema/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/voema/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/voema/memory src/mainboard/google/volteer/variants/voema/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E, H9HCNNNCRMBLPR-NEE
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E, H9HCNNNFBMBLPR-NEE
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 2(0b0010)  Parts = MT53D1G64D4NW-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M64D4NW-046 WT:E, H9HCNNNCRMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G64D8NW-046 WT:E, H9HCNNNFBMBLPR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 2(0b0010)  Parts = MT53D1G64D4NW-046 WT:A
diff --git a/src/mainboard/google/volteer/variants/voema/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/voema/memory/dram_id.generated.txt
index 840f71a47a..35f87b24d8 100644
--- a/src/mainboard/google/volteer/variants/voema/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/voema/memory/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 TGL lp4x src/mainboard/google/volteer/variants/voema/memory src/mainboard/google/volteer/variants/voema/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M64D4NW-046 WT:E       0 (0000)
 MT53E1G64D8NW-046 WT:E         1 (0001)
diff --git a/src/mainboard/google/volteer/variants/volet/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volet/memory/Makefile.inc
index f40fba6751..08b3d1f4b2 100644
--- a/src/mainboard/google/volteer/variants/volet/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/volet/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/volet/memory src/mainboard/google/volteer/variants/volet/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/volteer/variants/volet/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/volet/memory/dram_id.generated.txt
index 8d472df850..b2ef2e1b00 100644
--- a/src/mainboard/google/volteer/variants/volet/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/volet/memory/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 TGL lp4x src/mainboard/google/volteer/variants/volet/memory src/mainboard/google/volteer/variants/volet/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 H9HCNNNBKMMLXR-NEE             0 (0000)
diff --git a/src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc
index 37e4c227f5..24d2220dc0 100644
--- a/src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc
@@ -1,8 +1,10 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/volteer/memory src/mainboard/google/volteer/variants/volteer/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL, H9HCNNNBKMMLXR-NEE
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 1(0b0001)  Parts = K4UBE3D4AA-MGCL
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 2(0b0010)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-2.hex      # ID = 3(0b0011)  Parts = H9HCNNNFAMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 1(0b0001)  Parts = K4UBE3D4AA-MGCL
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 2(0b0010)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-2.hex      # ID = 3(0b0011)  Parts = H9HCNNNFAMMLXR-NEE
diff --git a/src/mainboard/google/volteer/variants/volteer/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/volteer/memory/dram_id.generated.txt
index 637fd23f61..119f790dea 100644
--- a/src/mainboard/google/volteer/variants/volteer/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/volteer/memory/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 TGL lp4x src/mainboard/google/volteer/variants/volteer/memory src/mainboard/google/volteer/variants/volteer/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCL                0 (0000)
 K4UBE3D4AA-MGCL                1 (0001)
diff --git a/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc
index 37e4c227f5..922cfa4e9d 100644
--- a/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc
@@ -1,8 +1,10 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/volteer2/memory src/mainboard/google/volteer/variants/volteer2/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL, H9HCNNNBKMMLXR-NEE
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 1(0b0001)  Parts = K4UBE3D4AA-MGCL
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 2(0b0010)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-2.hex      # ID = 3(0b0011)  Parts = H9HCNNNFAMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCL, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 1(0b0001)  Parts = K4UBE3D4AA-MGCL
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 2(0b0010)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-2.hex      # ID = 3(0b0011)  Parts = H9HCNNNFAMMLXR-NEE
diff --git a/src/mainboard/google/volteer/variants/volteer2/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/volteer2/memory/dram_id.generated.txt
index 637fd23f61..b8f68ab7a6 100644
--- a/src/mainboard/google/volteer/variants/volteer2/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/volteer2/memory/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 TGL lp4x src/mainboard/google/volteer/variants/volteer2/memory src/mainboard/google/volteer/variants/volteer2/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCL                0 (0000)
 K4UBE3D4AA-MGCL                1 (0001)
diff --git a/src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc b/src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc
index f40fba6751..3110242e2c 100644
--- a/src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc
@@ -1,7 +1,9 @@
-## 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 TGL lp4x src/mainboard/google/volteer/variants/voxel/memory src/mainboard/google/volteer/variants/voxel/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-0/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/volteer/variants/voxel/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/voxel/memory/dram_id.generated.txt
index 8d472df850..10d0b36702 100644
--- a/src/mainboard/google/volteer/variants/voxel/memory/dram_id.generated.txt
+++ b/src/mainboard/google/volteer/variants/voxel/memory/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 TGL lp4x src/mainboard/google/volteer/variants/voxel/memory src/mainboard/google/volteer/variants/voxel/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 H9HCNNNBKMMLXR-NEE             0 (0000)