diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.inc
index 4aac8f4884..ccc163c4dd 100644
--- a/src/mainboard/google/zork/Makefile.inc
+++ b/src/mainboard/google/zork/Makefile.inc
@@ -13,6 +13,7 @@ ramstage-y += sku_id.c
 verstage-y += verstage.c
 
 subdirs-y += variants/baseboard
+subdirs-y += variants/$(VARIANT_DIR)/spd
 subdirs-y += spd
 
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/zork/spd/Makefile.inc b/src/mainboard/google/zork/spd/Makefile.inc
index d6ae475b12..4ae310ae84 100644
--- a/src/mainboard/google/zork/spd/Makefile.inc
+++ b/src/mainboard/google/zork/spd/Makefile.inc
@@ -1,14 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# This directory
-SPD_SOURCES_DIR := src/mainboard/$(MAINBOARDDIR)/spd
+SPD_SOURCES_DIR=$(dir $(word 1, $(SPD_SOURCES)))
 
-APCB_SOURCES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).gen)
+APCB_SOURCES=$(foreach f, $(basename $(notdir $(SPD_SOURCES))), $(obj)/APCB_$(f).gen)
 
 # APCB binary with magic numbers to be replaced by apcb_edit tool
 APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATION)/APCB_magic.bin
 
-$(obj)/APCB_%.gen:	$(SPD_SOURCES_DIR)/%.hex \
+$(obj)/APCB_%.gen:	$(SPD_SOURCES_DIR)%.hex \
 			$(APCB_EDIT_TOOL) \
 			$(APCB_MAGIC_BLOB)
 	$(APCB_EDIT_TOOL) \
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-1.hex b/src/mainboard/google/zork/spd/ddr4-spd-1.hex
deleted file mode 100644
index 32d141f21f..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-1.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 45 21 00 08 00 00 00 00 02 03 00 00
-00 00 05 06 F8 FF 02 00 6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 00 00 00 00 BC 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-2.hex b/src/mainboard/google/zork/spd/ddr4-spd-2.hex
deleted file mode 100644
index 85b203599b..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-2.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 85 21 91 08 00 00 00 00 01 03 00 00
-00 00 05 06 F8 FF 02 00 6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 00 00 00 00 BC 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-3.hex b/src/mainboard/google/zork/spd/ddr4-spd-3.hex
deleted file mode 100644
index d2869eab1b..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-3.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 45 21 00 08 00 00 00 00 02 03 00 00
-00 00 06 07 F8 3F 00 00 73 73 73 11 00 73 F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 86 86 86 86 D6 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-4.hex b/src/mainboard/google/zork/spd/ddr4-spd-4.hex
deleted file mode 100644
index b6769928da..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-4.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 85 21 91 08 00 00 00 00 01 03 00 00
-00 00 06 07 FC 3F 00 00 6D 6D 6D 11 00 6D F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 86 86 86 86 D6 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-5.hex b/src/mainboard/google/zork/spd/ddr4-spd-5.hex
deleted file mode 100644
index d72bf1ed05..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-5.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 85 21 00 08 00 00 00 00 01 03 00 00
-00 00 06 07 F8 3F 00 00 73 73 73 11 00 73 F0 0A
-20 08 00 05 00 A8 18 2B 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 B5 00 86 86 86 86 D6 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-6.hex b/src/mainboard/google/zork/spd/ddr4-spd-6.hex
deleted file mode 100644
index 71cfff96d5..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-6.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 85 21 91 08 00 00 00 00 01 03 00 00
-00 00 06 07 F8 3F 00 00 73 73 73 11 00 73 F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 86 86 86 86 D6 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-7.hex b/src/mainboard/google/zork/spd/ddr4-spd-7.hex
deleted file mode 100644
index 7f92cd8529..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-7.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 46 29 00 08 00 00 00 00 02 03 00 00
-00 00 05 06 F8 FF 02 00 6E 6E 6E 11 00 6E F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 00 00 00 00 BC 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-8.hex b/src/mainboard/google/zork/spd/ddr4-spd-8.hex
deleted file mode 100644
index aca688e99d..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-8.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 46 29 00 08 00 00 00 00 02 03 00 00
-00 00 06 07 F8 3F 00 00 73 73 73 11 00 73 F0 0A
-20 08 00 05 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 86 86 86 86 D6 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-9.hex b/src/mainboard/google/zork/spd/ddr4-spd-9.hex
deleted file mode 100644
index 1ce7c21d4c..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-9.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 0C 03 46 29 00 08 00 00 00 00 02 03 00 00
-00 00 05 06 F8 FF 02 00 6E 6E 6E 11 00 6E 30 11
-F0 0A 20 08 00 F0 2B 34 28 00 78 00 14 3C 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 9C B5 00 00 00 00 BC 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20
-20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4-spd-empty.hex b/src/mainboard/google/zork/spd/ddr4-spd-empty.hex
deleted file mode 100644
index 1a5be53170..0000000000
--- a/src/mainboard/google/zork/spd/ddr4-spd-empty.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/src/mainboard/google/zork/spd/ddr4_spd_manifest.generated.txt b/src/mainboard/google/zork/spd/ddr4_spd_manifest.generated.txt
deleted file mode 100644
index 05d3207144..0000000000
--- a/src/mainboard/google/zork/spd/ddr4_spd_manifest.generated.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-H5AN8G6NDJR-XNC,ddr4-spd-1.hex
-MT40A512M16TB-062E:J,ddr4-spd-1.hex
-H5ANAG6NCMR-XNC,ddr4-spd-2.hex
-HMA851S6CJR6N-VK,ddr4-spd-3.hex
-K4A8G165WC-BCTD,ddr4-spd-3.hex
-H5AN8G6NCJR-VKC,ddr4-spd-3.hex
-MT40A1G16KNR-075:E,ddr4-spd-4.hex
-K4AAG165WB-MCTD,ddr4-spd-5.hex
-H5ANAG6NCMR-VKC,ddr4-spd-6.hex
-K4A8G165WC-BCWE,ddr4-spd-1.hex
-MT40A1G16KD-062E:E,ddr4-spd-7.hex
-K4AAG165WA-BCWE,ddr4-spd-7.hex
-H5AN8G6NCJR-XNC,ddr4-spd-1.hex
-K4AAG165WA-BCTD,ddr4-spd-8.hex
-H5ANAG6NDMR-XNC,ddr4-spd-2.hex
-H5ANAG6NCJR-XNC,ddr4-spd-9.hex
-K4AAG165WB-BCWE,ddr4-spd-9.hex
-MT40A1G16RC-062E:B,ddr4-spd-9.hex
-4JQA-0622AD,ddr4-spd-1.hex
diff --git a/src/mainboard/google/zork/variants/berknip/Makefile.inc b/src/mainboard/google/zork/variants/berknip/Makefile.inc
index 51d19fe9ba..87bc511877 100644
--- a/src/mainboard/google/zork/variants/berknip/Makefile.inc
+++ b/src/mainboard/google/zork/variants/berknip/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/berknip/spd/Makefile.inc b/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
index b58483803c..019318344e 100644
--- a/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc
@@ -1,13 +1,15 @@
-## 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/berknip/spd src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-3.hex      # ID = 0(0b0000)  Parts = K4A8G165WC-BCTD
-SPD_SOURCES += ddr4-spd-8.hex      # ID = 1(0b0001)  Parts = K4AAG165WA-BCTD
-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-9.hex      # ID = 4(0b0100)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
-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
+SPD_SOURCES += spd/ddr4/set-0/spd-3.hex      # ID = 0(0b0000)  Parts = K4A8G165WC-BCTD
+SPD_SOURCES += spd/ddr4/set-0/spd-8.hex      # ID = 1(0b0001)  Parts = K4AAG165WA-BCTD
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 3(0b0011)  Parts = H5AN8G6NDJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 4(0b0100)  Parts = H5ANAG6NCJR-XNC, K4AAG165WB-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 5(0b0101)  Parts = K4A8G165WC-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 6(0b0110)  Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 7(0b0111)  Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/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
index 090dc3ecf2..b9e8393905 100644
--- a/src/mainboard/google/zork/variants/berknip/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/berknip/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/berknip/spd src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4A8G165WC-BCTD                0 (0000)
 MT40A512M16TB-062E:J           2 (0010)
diff --git a/src/mainboard/google/zork/variants/dalboz/Makefile.inc b/src/mainboard/google/zork/variants/dalboz/Makefile.inc
index 51d19fe9ba..87bc511877 100644
--- a/src/mainboard/google/zork/variants/dalboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/dalboz/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/dalboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/dalboz/spd/Makefile.inc
index e8ed39da29..e5f439c2d2 100644
--- a/src/mainboard/google/zork/variants/dalboz/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/dalboz/spd/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 PCO ddr4 src/mainboard/google/zork/variants/dalboz/spd src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-3.hex      # ID = 0(0b0000)  Parts = HMA851S6CJR6N-VK
-SPD_SOURCES += ddr4-spd-6.hex      # ID = 1(0b0001)  Parts = H5ANAG6NCMR-VKC
-SPD_SOURCES += ddr4-spd-3.hex      # ID = 2(0b0010)  Parts = K4A8G165WC-BCTD
-SPD_SOURCES += ddr4-spd-5.hex      # ID = 3(0b0011)  Parts = K4AAG165WB-MCTD
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 4(0b0100)  Parts = K4A8G165WC-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-3.hex      # ID = 0(0b0000)  Parts = HMA851S6CJR6N-VK
+SPD_SOURCES += spd/ddr4/set-0/spd-6.hex      # ID = 1(0b0001)  Parts = H5ANAG6NCMR-VKC
+SPD_SOURCES += spd/ddr4/set-0/spd-3.hex      # ID = 2(0b0010)  Parts = K4A8G165WC-BCTD
+SPD_SOURCES += spd/ddr4/set-0/spd-5.hex      # ID = 3(0b0011)  Parts = K4AAG165WB-MCTD
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 4(0b0100)  Parts = K4A8G165WC-BCWE
diff --git a/src/mainboard/google/zork/variants/dalboz/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/dalboz/spd/dram_id.generated.txt
index f70d7f34d4..6276d19982 100644
--- a/src/mainboard/google/zork/variants/dalboz/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/dalboz/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/dalboz/spd src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 HMA851S6CJR6N-VK               0 (0000)
 H5ANAG6NCMR-VKC                1 (0001)
diff --git a/src/mainboard/google/zork/variants/dirinboz/Makefile.inc b/src/mainboard/google/zork/variants/dirinboz/Makefile.inc
index 51d19fe9ba..87bc511877 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 6d8e7495ba..605e49da40 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 9f9949cf87..f4e6597d3d 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)
diff --git a/src/mainboard/google/zork/variants/ezkinil/Makefile.inc b/src/mainboard/google/zork/variants/ezkinil/Makefile.inc
index 51d19fe9ba..87bc511877 100644
--- a/src/mainboard/google/zork/variants/ezkinil/Makefile.inc
+++ b/src/mainboard/google/zork/variants/ezkinil/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/ezkinil/spd/Makefile.inc b/src/mainboard/google/zork/variants/ezkinil/spd/Makefile.inc
index 10dea1cd35..51330a60e6 100644
--- a/src/mainboard/google/zork/variants/ezkinil/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/ezkinil/spd/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 PCO ddr4 src/mainboard/google/zork/variants/ezkinil/spd src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-3.hex      # ID = 0(0b0000)  Parts = H5AN8G6NCJR-VKC
-SPD_SOURCES += ddr4-spd-empty.hex      # ID = 1(0b0001)
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 2(0b0010)  Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 3(0b0011)  Parts = MT40A1G16KD-062E:E
-SPD_SOURCES += ddr4-spd-3.hex      # ID = 4(0b0100)  Parts = K4A8G165WC-BCTD
+SPD_SOURCES += spd/ddr4/set-0/spd-3.hex      # ID = 0(0b0000)  Parts = H5AN8G6NCJR-VKC
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 1(0b0001)
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 3(0b0011)  Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-3.hex      # ID = 4(0b0100)  Parts = K4A8G165WC-BCTD
diff --git a/src/mainboard/google/zork/variants/ezkinil/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/ezkinil/spd/dram_id.generated.txt
index 7e54cc1b08..c100cea79a 100644
--- a/src/mainboard/google/zork/variants/ezkinil/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/ezkinil/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/ezkinil/spd src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H5AN8G6NCJR-VKC                0 (0000)
 MT40A512M16TB-062E:J           2 (0010)
diff --git a/src/mainboard/google/zork/variants/gumboz/Makefile.inc b/src/mainboard/google/zork/variants/gumboz/Makefile.inc
index 51d19fe9ba..87bc511877 100644
--- a/src/mainboard/google/zork/variants/gumboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/gumboz/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/gumboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/gumboz/spd/Makefile.inc
index 6d8e7495ba..dba2027b65 100644
--- a/src/mainboard/google/zork/variants/gumboz/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/gumboz/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/gumboz/spd src/mainboard/google/zork/variants/gumboz/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/gumboz/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/gumboz/spd/dram_id.generated.txt
index 9f9949cf87..685bd3e839 100644
--- a/src/mainboard/google/zork/variants/gumboz/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/gumboz/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/gumboz/spd src/mainboard/google/zork/variants/gumboz/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4A8G165WC-BCTD                2 (0010)
 K4A8G165WC-BCWE                4 (0100)
diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.inc
index 51d19fe9ba..87bc511877 100644
--- a/src/mainboard/google/zork/variants/morphius/Makefile.inc
+++ b/src/mainboard/google/zork/variants/morphius/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/morphius/spd/Makefile.inc b/src/mainboard/google/zork/variants/morphius/spd/Makefile.inc
index 0851ab288c..d07a92ea70 100644
--- a/src/mainboard/google/zork/variants/morphius/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/morphius/spd/Makefile.inc
@@ -1,14 +1,16 @@
-## 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/morphius/spd src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-9.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCJR-XNC, MT40A1G16RC-062E:B
-SPD_SOURCES += ddr4-spd-empty.hex      # ID = 1(0b0001)
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 2(0b0010)  Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 3(0b0011)  Parts = MT40A1G16KD-062E:E
-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-1.hex      # ID = 6(0b0110)  Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-7.hex      # ID = 7(0b0111)  Parts = K4AAG165WA-BCWE
-SPD_SOURCES += ddr4-spd-2.hex      # ID = 8(0b1000)  Parts = H5ANAG6NCMR-XNC
-SPD_SOURCES += ddr4-spd-1.hex      # ID = 9(0b1001)  Parts = K4A8G165WC-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 0(0b0000)  Parts = H5ANAG6NCJR-XNC, MT40A1G16RC-062E:B
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 1(0b0001)
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 3(0b0011)  Parts = MT40A1G16KD-062E:E
+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-1.hex      # ID = 6(0b0110)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 7(0b0111)  Parts = K4AAG165WA-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 8(0b1000)  Parts = H5ANAG6NCMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 9(0b1001)  Parts = K4A8G165WC-BCWE
diff --git a/src/mainboard/google/zork/variants/morphius/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/morphius/spd/dram_id.generated.txt
index 399228e4bc..f71d78dfe5 100644
--- a/src/mainboard/google/zork/variants/morphius/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/morphius/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/morphius/spd src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT40A512M16TB-062E:J           2 (0010)
 MT40A1G16KD-062E:E             3 (0011)
diff --git a/src/mainboard/google/zork/variants/shuboz/Makefile.inc b/src/mainboard/google/zork/variants/shuboz/Makefile.inc
index e5ec76de14..87bc511877 100644
--- a/src/mainboard/google/zork/variants/shuboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/shuboz/Makefile.inc
@@ -1,5 +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/shuboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/shuboz/spd/Makefile.inc
index 87b5aa9797..316880625f 100644
--- a/src/mainboard/google/zork/variants/shuboz/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/shuboz/spd/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 PCO ddr4 src/mainboard/google/zork/variants/shuboz/spd src/mainboard/google/zork/variants/shuboz/spd/mem_parts_used.txt
 
 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 += spd/ddr4/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 1(0b0001)  Parts = H5AN8G6NCJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 2(0b0010)  Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 3(0b0011)  Parts = K4AAG165WA-BCWE
diff --git a/src/mainboard/google/zork/variants/shuboz/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/shuboz/spd/dram_id.generated.txt
index 8019b2e2f6..a38e73fe1c 100644
--- a/src/mainboard/google/zork/variants/shuboz/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/shuboz/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/shuboz/spd src/mainboard/google/zork/variants/shuboz/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT40A512M16TB-062E:J           0 (0000)
 H5AN8G6NCJR-XNC                1 (0001)
diff --git a/src/mainboard/google/zork/variants/trembyle/Makefile.inc b/src/mainboard/google/zork/variants/trembyle/Makefile.inc
index 57e7136ddc..3b259741f7 100644
--- a/src/mainboard/google/zork/variants/trembyle/Makefile.inc
+++ b/src/mainboard/google/zork/variants/trembyle/Makefile.inc
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-subdirs-y += ./spd
-
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/zork/variants/trembyle/spd/Makefile.inc b/src/mainboard/google/zork/variants/trembyle/spd/Makefile.inc
index 6508c26b28..17af45a423 100644
--- a/src/mainboard/google/zork/variants/trembyle/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/trembyle/spd/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 PCO ddr4 src/mainboard/google/zork/variants/trembyle/spd src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
 
 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 += spd/ddr4/set-0/spd-3.hex      # ID = 0(0b0000)  Parts = H5AN8G6NCJR-VKC
+SPD_SOURCES += spd/ddr4/set-0/spd-6.hex      # ID = 1(0b0001)  Parts = H5ANAG6NCMR-VKC
diff --git a/src/mainboard/google/zork/variants/trembyle/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/trembyle/spd/dram_id.generated.txt
index 20232a3378..6cb8f5a386 100644
--- a/src/mainboard/google/zork/variants/trembyle/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/trembyle/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/trembyle/spd src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H5AN8G6NCJR-VKC                0 (0000)
 H5ANAG6NCMR-VKC                1 (0001)
diff --git a/src/mainboard/google/zork/variants/vilboz/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/Makefile.inc
index f8ed418bb9..cad950bbb7 100644
--- a/src/mainboard/google/zork/variants/vilboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/vilboz/Makefile.inc
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-subdirs-y += ./spd
-
 romstage-y += romstage.c
 
 ramstage-y += variant.c
diff --git a/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
index e4daa51695..f4d0cb446d 100644
--- a/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc
@@ -1,13 +1,15 @@
-## 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/vilboz/spd src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-empty.hex      # ID = 0(0b0000)
-SPD_SOURCES += ddr4-spd-empty.hex      # ID = 1(0b0001)
-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
-SPD_SOURCES += ddr4-spd-2.hex      # ID = 7(0b0111)  Parts = H5ANAG6NDMR-XNC
-SPD_SOURCES += ddr4-spd-9.hex      # ID = 8(0b1000)  Parts = MT40A1G16RC-062E:B
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 0(0b0000)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 1(0b0001)
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 2(0b0010)  Parts = K4A8G165WC-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 3(0b0011)  Parts = H5AN8G6NDJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 4(0b0100)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 5(0b0101)  Parts = K4AAG165WA-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 6(0b0110)  Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-2.hex      # ID = 7(0b0111)  Parts = H5ANAG6NDMR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-9.hex      # ID = 8(0b1000)  Parts = MT40A1G16RC-062E:B
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
index 5a71ea9bf4..4211dab31c 100644
--- a/src/mainboard/google/zork/variants/vilboz/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/vilboz/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/vilboz/spd src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4A8G165WC-BCWE                2 (0010)
 H5AN8G6NDJR-XNC                3 (0011)
diff --git a/src/mainboard/google/zork/variants/woomax/Makefile.inc b/src/mainboard/google/zork/variants/woomax/Makefile.inc
index 57e7136ddc..3b259741f7 100644
--- a/src/mainboard/google/zork/variants/woomax/Makefile.inc
+++ b/src/mainboard/google/zork/variants/woomax/Makefile.inc
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-subdirs-y += ./spd
-
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
index 91ef5e5bae..2da8dc53a3 100644
--- a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
@@ -1,16 +1,18 @@
-## 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/woomax/spd src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
 
 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-empty.hex      # ID = 2(0b0010)
-SPD_SOURCES += ddr4-spd-empty.hex      # ID = 3(0b0011)
-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
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 1(0b0001)  Parts = H5AN8G6NCJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 2(0b0010)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 3(0b0011)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 4(0b0100)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 5(0b0101)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 6(0b0110)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex      # ID = 7(0b0111)
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 8(0b1000)  Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex      # ID = 9(0b1001)  Parts = H5AN8G6NCJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex      # ID = 10(0b1010)  Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/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
index c0583f495a..19039621ba 100644
--- a/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/woomax/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/woomax/spd src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT40A512M16TB-062E:J           0 (0000)
 H5AN8G6NCJR-XNC                1 (0001)