mb/google/dedede: Migrate dedede 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 dedede 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 cret:

util/spd_tools/bin/part_id_gen \
  JSL \
  lp4x \
  src/mainboard/google/dedede/variants/cret/memory \
  src/mainboard/google/dedede/variants/cret/memory/mem_parts_used.txt

For cappy, the Makefile.inc was manually modified to use the new
placeholder value.

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/dedede -a -x --timeless

Change-Id: I2871ff45d6202520d4466b68a4d5bb283faf2b63
Signed-off-by: Reka Norman <rekanorman@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57734
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

62 files changed, 254 insertions, 466 deletions

diff --git a/src/mainboard/google/dedede/spd/Makefile.inc b/src/mainboard/google/dedede/spd/Makefile.inc
index ebc11e5d8a..182c40a99a 100644
--- a/src/mainboard/google/dedede/spd/Makefile.inc
+++ b/src/mainboard/google/dedede/spd/Makefile.inc
@@ -1,3 +1,3 @@
 ## SPDX-License-Identifier: GPL-2.0-or-later
 
-LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/soc/intel/jasperlake/spd/$(f))
+LIB_SPD_DEPS := $(SPD_SOURCES)
diff --git a/src/mainboard/google/dedede/variants/blipper/memory/Makefile.inc b/src/mainboard/google/dedede/variants/blipper/memory/Makefile.inc
index d0960c7768..1e285583eb 100644
--- a/src/mainboard/google/dedede/variants/blipper/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/blipper/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 JSL lp4x src/mainboard/google/dedede/variants/blipper/memory src/mainboard/google/dedede/variants/blipper/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
diff --git a/src/mainboard/google/dedede/variants/blipper/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/blipper/memory/dram_id.generated.txt
index 0df7bfc8d6..05be4b72be 100644
--- a/src/mainboard/google/dedede/variants/blipper/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/blipper/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 JSL lp4x src/mainboard/google/dedede/variants/blipper/memory src/mainboard/google/dedede/variants/blipper/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/boten/memory/Makefile.inc b/src/mainboard/google/dedede/variants/boten/memory/Makefile.inc
index c0c0902aa2..4cd68e044f 100644
--- a/src/mainboard/google/dedede/variants/boten/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/boten/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 JSL lp4x src/mainboard/google/dedede/variants/boten/memory src/mainboard/google/dedede/variants/boten/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/boten/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/boten/memory/dram_id.generated.txt
index 7576d179b7..465dbb23a7 100644
--- a/src/mainboard/google/dedede/variants/boten/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/boten/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 JSL lp4x src/mainboard/google/dedede/variants/boten/memory src/mainboard/google/dedede/variants/boten/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.inc b/src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.inc
index 1d39fbc6b4..f4aaf51666 100644
--- a/src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/bugzzy/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 JSL lp4x src/mainboard/google/dedede/variants/bugzzy/memory src/mainboard/google/dedede/variants/bugzzy/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/bugzzy/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/bugzzy/memory/dram_id.generated.txt
index da0441c353..f51f815abe 100644
--- a/src/mainboard/google/dedede/variants/bugzzy/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/bugzzy/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 JSL lp4x src/mainboard/google/dedede/variants/bugzzy/memory src/mainboard/google/dedede/variants/bugzzy/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc
index b0ca2223a8..6751a4283f 100644
--- a/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc
@@ -2,4 +2,4 @@
 ## This is an auto-generated file. Do not edit!!
 ## Add memory parts in mem_parts_used.txt and run spd_tools to regenerate.
 
-SPD_SOURCES = placeholder.spd.hex
+SPD_SOURCES = placeholder
diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc
index 1d39fbc6b4..ac290dd798 100644
--- a/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/cappy2/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 JSL lp4x src/mainboard/google/dedede/variants/cappy2/memory src/mainboard/google/dedede/variants/cappy2/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt
index da0441c353..c5a50032c6 100644
--- a/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/cappy2/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 JSL lp4x src/mainboard/google/dedede/variants/cappy2/memory src/mainboard/google/dedede/variants/cappy2/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/corori/memory/Makefile.inc b/src/mainboard/google/dedede/variants/corori/memory/Makefile.inc
index 315f10fa77..8e766b352a 100644
--- a/src/mainboard/google/dedede/variants/corori/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/corori/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 JSL lp4x src/mainboard/google/dedede/variants/corori/memory src/mainboard/google/dedede/variants/corori/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/corori/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/corori/memory/dram_id.generated.txt
index d0b9209884..f9eac57cf3 100644
--- a/src/mainboard/google/dedede/variants/corori/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/corori/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 JSL lp4x src/mainboard/google/dedede/variants/corori/memory src/mainboard/google/dedede/variants/corori/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/cret/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cret/memory/Makefile.inc
index 42c6cf4065..31d1f7cb34 100644
--- a/src/mainboard/google/dedede/variants/cret/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/cret/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 JSL lp4x src/mainboard/google/dedede/variants/cret/memory src/mainboard/google/dedede/variants/cret/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/cret/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/cret/memory/dram_id.generated.txt
index 0dbc38e6f1..ae467ecca2 100644
--- a/src/mainboard/google/dedede/variants/cret/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/cret/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 JSL lp4x src/mainboard/google/dedede/variants/cret/memory src/mainboard/google/dedede/variants/cret/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 MT53E512M32D2NP-046 WT:F       0 (0000)
diff --git a/src/mainboard/google/dedede/variants/drawcia/memory/Makefile.inc b/src/mainboard/google/dedede/variants/drawcia/memory/Makefile.inc
index a934428471..592a646597 100644
--- a/src/mainboard/google/dedede/variants/drawcia/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/drawcia/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 JSL lp4x src/mainboard/google/dedede/variants/drawcia/memory src/mainboard/google/dedede/variants/drawcia/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, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/drawcia/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/drawcia/memory/dram_id.generated.txt
index e8ec694d26..184e9e0638 100644
--- a/src/mainboard/google/dedede/variants/drawcia/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/drawcia/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 JSL lp4x src/mainboard/google/dedede/variants/drawcia/memory src/mainboard/google/dedede/variants/drawcia/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/dedede/variants/driblee/memory/Makefile.inc b/src/mainboard/google/dedede/variants/driblee/memory/Makefile.inc
index 42c6cf4065..9adba86477 100644
--- a/src/mainboard/google/dedede/variants/driblee/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/driblee/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 JSL lp4x src/mainboard/google/dedede/variants/driblee/memory src/mainboard/google/dedede/variants/driblee/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:F, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/driblee/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/driblee/memory/dram_id.generated.txt
index 0dbc38e6f1..ee857bad81 100644
--- a/src/mainboard/google/dedede/variants/driblee/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/driblee/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 JSL lp4x src/mainboard/google/dedede/variants/driblee/memory src/mainboard/google/dedede/variants/driblee/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 MT53E512M32D2NP-046 WT:F       0 (0000)
diff --git a/src/mainboard/google/dedede/variants/galtic/memory/Makefile.inc b/src/mainboard/google/dedede/variants/galtic/memory/Makefile.inc
index f7e5dac859..016e8ea290 100644
--- a/src/mainboard/google/dedede/variants/galtic/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/galtic/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 JSL lp4x src/mainboard/google/dedede/variants/galtic/memory src/mainboard/google/dedede/variants/galtic/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E
-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-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
diff --git a/src/mainboard/google/dedede/variants/galtic/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/galtic/memory/dram_id.generated.txt
index 570f6802b4..9d92cf1f97 100644
--- a/src/mainboard/google/dedede/variants/galtic/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/galtic/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 JSL lp4x src/mainboard/google/dedede/variants/galtic/memory src/mainboard/google/dedede/variants/galtic/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 MT53E512M32D2NP-046 WT:E       0 (0000)
diff --git a/src/mainboard/google/dedede/variants/gooey/memory/Makefile.inc b/src/mainboard/google/dedede/variants/gooey/memory/Makefile.inc
index c0c0902aa2..9c1882a51f 100644
--- a/src/mainboard/google/dedede/variants/gooey/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/gooey/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 JSL lp4x src/mainboard/google/dedede/variants/gooey/memory src/mainboard/google/dedede/variants/gooey/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/gooey/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/gooey/memory/dram_id.generated.txt
index 7576d179b7..7803113128 100644
--- a/src/mainboard/google/dedede/variants/gooey/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/gooey/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 JSL lp4x src/mainboard/google/dedede/variants/gooey/memory src/mainboard/google/dedede/variants/gooey/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/haboki/memory/Makefile.inc b/src/mainboard/google/dedede/variants/haboki/memory/Makefile.inc
index f6282bf04c..2c56bafad6 100644
--- a/src/mainboard/google/dedede/variants/haboki/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/haboki/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 JSL lp4x src/mainboard/google/dedede/variants/haboki/memory src/mainboard/google/dedede/variants/haboki/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 += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/haboki/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/haboki/memory/dram_id.generated.txt
index 856d016914..01f0e56c65 100644
--- a/src/mainboard/google/dedede/variants/haboki/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/haboki/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 JSL lp4x src/mainboard/google/dedede/variants/haboki/memory src/mainboard/google/dedede/variants/haboki/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/dedede/variants/kracko/memory/Makefile.inc b/src/mainboard/google/dedede/variants/kracko/memory/Makefile.inc
index f6282bf04c..100aaf258a 100644
--- a/src/mainboard/google/dedede/variants/kracko/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/kracko/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 JSL lp4x src/mainboard/google/dedede/variants/kracko/memory src/mainboard/google/dedede/variants/kracko/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 += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/kracko/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/kracko/memory/dram_id.generated.txt
index 856d016914..12a3053905 100644
--- a/src/mainboard/google/dedede/variants/kracko/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/kracko/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 JSL lp4x src/mainboard/google/dedede/variants/kracko/memory src/mainboard/google/dedede/variants/kracko/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/dedede/variants/lalala/memory/Makefile.inc b/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
index 285df73c2e..dc56d54f60 100644
--- a/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/lalala/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 JSL lp4x src/mainboard/google/dedede/variants/lalala/memory src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, 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 = K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt
index 100c322e91..f2abc1b2b8 100644
--- a/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/lalala/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 JSL lp4x src/mainboard/google/dedede/variants/lalala/memory src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/lantis/memory/Makefile.inc b/src/mainboard/google/dedede/variants/lantis/memory/Makefile.inc
index a934428471..5c0d156ef4 100644
--- a/src/mainboard/google/dedede/variants/lantis/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/lantis/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 JSL lp4x src/mainboard/google/dedede/variants/lantis/memory src/mainboard/google/dedede/variants/lantis/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, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR, MT53E512M32D1NP-046 WT:B
diff --git a/src/mainboard/google/dedede/variants/lantis/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/lantis/memory/dram_id.generated.txt
index e8ec694d26..8f0a779291 100644
--- a/src/mainboard/google/dedede/variants/lantis/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/lantis/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 JSL lp4x src/mainboard/google/dedede/variants/lantis/memory src/mainboard/google/dedede/variants/lantis/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/dedede/variants/madoo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/madoo/memory/Makefile.inc
index 693240ebaf..eb98d15c9b 100644
--- a/src/mainboard/google/dedede/variants/madoo/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/madoo/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 JSL lp4x src/mainboard/google/dedede/variants/madoo/memory src/mainboard/google/dedede/variants/madoo/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/madoo/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/madoo/memory/dram_id.generated.txt
index 2a158ee9ec..f258c0b1ca 100644
--- a/src/mainboard/google/dedede/variants/madoo/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/madoo/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 JSL lp4x src/mainboard/google/dedede/variants/madoo/memory src/mainboard/google/dedede/variants/madoo/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 MT53E512M32D2NP-046 WT:E       0 (0000)
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc b/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
index e5276f0c11..2a4c741842 100644
--- a/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/magolor/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 JSL lp4x src/mainboard/google/dedede/variants/magolor/memory src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B, K4U6E3S4AB-MGCL, H54G46CYRBX267
-SPD_SOURCES += lp4x-spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += lp4x-spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE, MT53E512M32D1NP-046 WT:B, K4U6E3S4AB-MGCL, H54G46CYRBX267
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt
index cf053ecbc8..9194c30d01 100644
--- a/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/magolor/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 JSL lp4x src/mainboard/google/dedede/variants/magolor/memory src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/metaknight/memory/Makefile.inc b/src/mainboard/google/dedede/variants/metaknight/memory/Makefile.inc
index 285df73c2e..23fda1dc2f 100644
--- a/src/mainboard/google/dedede/variants/metaknight/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/metaknight/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 JSL lp4x src/mainboard/google/dedede/variants/metaknight/memory src/mainboard/google/dedede/variants/metaknight/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, 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 = K4UBE3D4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/metaknight/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/metaknight/memory/dram_id.generated.txt
index 100c322e91..c53c279cc9 100644
--- a/src/mainboard/google/dedede/variants/metaknight/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/metaknight/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 JSL lp4x src/mainboard/google/dedede/variants/metaknight/memory src/mainboard/google/dedede/variants/metaknight/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/pirika/memory/Makefile.inc b/src/mainboard/google/dedede/variants/pirika/memory/Makefile.inc
index 315f10fa77..c30ef05563 100644
--- a/src/mainboard/google/dedede/variants/pirika/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/pirika/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 JSL lp4x src/mainboard/google/dedede/variants/pirika/memory src/mainboard/google/dedede/variants/pirika/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = H9HCNNNBKMMLXR-NEE, K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/pirika/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/pirika/memory/dram_id.generated.txt
index d0b9209884..08e0dc8459 100644
--- a/src/mainboard/google/dedede/variants/pirika/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/pirika/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 JSL lp4x src/mainboard/google/dedede/variants/pirika/memory src/mainboard/google/dedede/variants/pirika/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 H9HCNNNBKMMLXR-NEE             0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/sasuke/memory/Makefile.inc b/src/mainboard/google/dedede/variants/sasuke/memory/Makefile.inc
index 1d39fbc6b4..730b0678dd 100644
--- a/src/mainboard/google/dedede/variants/sasuke/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/sasuke/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 JSL lp4x src/mainboard/google/dedede/variants/sasuke/memory src/mainboard/google/dedede/variants/sasuke/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/sasuke/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/sasuke/memory/dram_id.generated.txt
index da0441c353..893112a8a7 100644
--- a/src/mainboard/google/dedede/variants/sasuke/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/sasuke/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 JSL lp4x src/mainboard/google/dedede/variants/sasuke/memory src/mainboard/google/dedede/variants/sasuke/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/sasukette/memory/Makefile.inc b/src/mainboard/google/dedede/variants/sasukette/memory/Makefile.inc
index 1d39fbc6b4..490e591fd8 100644
--- a/src/mainboard/google/dedede/variants/sasukette/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/sasukette/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 JSL lp4x src/mainboard/google/dedede/variants/sasukette/memory src/mainboard/google/dedede/variants/sasukette/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/sasukette/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/sasukette/memory/dram_id.generated.txt
index da0441c353..b02dcd7dd2 100644
--- a/src/mainboard/google/dedede/variants/sasukette/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/sasukette/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 JSL lp4x src/mainboard/google/dedede/variants/sasukette/memory src/mainboard/google/dedede/variants/sasukette/memory/mem_parts_used.txt
+
 DRAM Part Name                 ID to assign
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/mainboard/google/dedede/variants/storo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/storo/memory/Makefile.inc
index c0e2fffb6b..49e92636b1 100644
--- a/src/mainboard/google/dedede/variants/storo/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/storo/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 JSL lp4x src/mainboard/google/dedede/variants/storo/memory src/mainboard/google/dedede/variants/storo/memory/mem_parts_used.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-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 2(0b0010)  Parts = H9HCNNNCPMMLXR-NEE
diff --git a/src/mainboard/google/dedede/variants/storo/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/storo/memory/dram_id.generated.txt
index ad6374dcce..f450b73bd2 100644
--- a/src/mainboard/google/dedede/variants/storo/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/storo/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 JSL lp4x src/mainboard/google/dedede/variants/storo/memory src/mainboard/google/dedede/variants/storo/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/dedede/variants/waddledee/memory/Makefile.inc b/src/mainboard/google/dedede/variants/waddledee/memory/Makefile.inc
index c6683e2e94..be80563e6b 100644
--- a/src/mainboard/google/dedede/variants/waddledee/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/waddledee/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 JSL lp4x src/mainboard/google/dedede/variants/waddledee/memory src/mainboard/google/dedede/variants/waddledee/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E
-SPD_SOURCES += lp4x-spd-7.hex      # ID = 1(0b0001)  Parts = NT6AP256T32AV-J2
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E
+SPD_SOURCES += spd/lp4x/set-1/spd-7.hex      # ID = 1(0b0001)  Parts = NT6AP256T32AV-J2
diff --git a/src/mainboard/google/dedede/variants/waddledee/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/waddledee/memory/dram_id.generated.txt
index 3f2a5dbf40..4e52bb319a 100644
--- a/src/mainboard/google/dedede/variants/waddledee/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/waddledee/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 JSL lp4x src/mainboard/google/dedede/variants/waddledee/memory src/mainboard/google/dedede/variants/waddledee/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 NT6AP256T32AV-J2               1 (0001)
diff --git a/src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.inc
index be4a11895b..54c47c93d5 100644
--- a/src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/waddledoo/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 JSL lp4x src/mainboard/google/dedede/variants/waddledoo/memory src/mainboard/google/dedede/variants/waddledoo/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-7.hex      # ID = 0(0b0000)  Parts = NT6AP256T32AV-J2
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:E
+SPD_SOURCES += spd/lp4x/set-1/spd-7.hex      # ID = 0(0b0000)  Parts = NT6AP256T32AV-J2
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:E
diff --git a/src/mainboard/google/dedede/variants/waddledoo/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/waddledoo/memory/dram_id.generated.txt
index 3c613288d2..70ddffdb4a 100644
--- a/src/mainboard/google/dedede/variants/waddledoo/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/waddledoo/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 JSL lp4x src/mainboard/google/dedede/variants/waddledoo/memory src/mainboard/google/dedede/variants/waddledoo/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 NT6AP256T32AV-J2               0 (0000)
 MT53E512M32D2NP-046 WT:E       1 (0001)
diff --git a/src/mainboard/google/dedede/variants/wheelie/memory/Makefile.inc b/src/mainboard/google/dedede/variants/wheelie/memory/Makefile.inc
index d0960c7768..e5fdc0d35f 100644
--- a/src/mainboard/google/dedede/variants/wheelie/memory/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/wheelie/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 JSL lp4x src/mainboard/google/dedede/variants/wheelie/memory src/mainboard/google/dedede/variants/wheelie/memory/mem_list_variant.txt
 
 SPD_SOURCES =
-SPD_SOURCES += lp4x-spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
diff --git a/src/mainboard/google/dedede/variants/wheelie/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/wheelie/memory/dram_id.generated.txt
index 0df7bfc8d6..a64800624e 100644
--- a/src/mainboard/google/dedede/variants/wheelie/memory/dram_id.generated.txt
+++ b/src/mainboard/google/dedede/variants/wheelie/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 JSL lp4x src/mainboard/google/dedede/variants/wheelie/memory src/mainboard/google/dedede/variants/wheelie/memory/mem_list_variant.txt
+
 DRAM Part Name                 ID to assign
 MT53E512M32D2NP-046 WT:E       0 (0000)
 K4U6E3S4AA-MGCR                0 (0000)
diff --git a/src/soc/intel/jasperlake/spd/lp4x-spd-1.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-1.hex
deleted file mode 100644
index 50f50e2348..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-1.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 16 21 04 08 00 00 00 00 02 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 C0 08 60
-04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-10.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-10.hex
deleted file mode 100644
index efeca0a51b..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-10.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 17 29 94 08 00 00 00 00 0A 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 E0 0B F0
-05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-2.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-2.hex
deleted file mode 100644
index 866b466d66..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-2.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 17 29 98 08 00 00 00 00 09 22 00 00
-00 00 04 FF 12 29 15 00 96 00 90 A8 90 C0 08 60
-04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E2 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-3.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-3.hex
deleted file mode 100644
index 6db2d80aec..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-3.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 16 21 94 08 00 00 00 00 0A 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 C0 08 60
-04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-4.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-4.hex
deleted file mode 100644
index c4180b613c..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-4.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 17 29 04 08 00 00 00 00 02 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 E0 0B F0
-05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-5.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-5.hex
deleted file mode 100644
index 77230e7a14..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-5.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 16 21 94 08 00 00 00 00 02 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 C0 08 60
-04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-6.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-6.hex
deleted file mode 100644
index 8da34f100e..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-6.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 17 29 94 08 00 00 00 00 02 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 E0 0B F0
-05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-7.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-7.hex
deleted file mode 100644
index 2fe6757d9d..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-7.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 15 19 04 08 00 00 00 00 02 22 00 00
-00 00 05 0A 80 54 01 00 89 00 90 A8 90 A0 05 D0
-02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 FB 00 A6 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-8.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-8.hex
deleted file mode 100644
index 1fe256a558..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-8.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 16 21 B4 08 00 00 00 00 0A 22 00 00
-00 00 04 FF 92 54 05 00 87 00 90 A8 90 C0 08 60
-04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x-spd-9.hex b/src/soc/intel/jasperlake/spd/lp4x-spd-9.hex
deleted file mode 100644
index 29a43703ff..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x-spd-9.hex
+++ /dev/null
@@ -1,32 +0,0 @@
-23 11 11 0E 15 19 04 08 00 00 00 00 02 22 00 00
-00 00 04 0A 80 54 05 00 87 00 90 A8 90 A0 05 D0
-02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 E5 00 E0 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 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/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt b/src/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt
deleted file mode 100644
index e12608d2a5..0000000000
--- a/src/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-H9HCNNNBKMMLXR-NEE,lp4x-spd-1.hex
-H9HCNNNFAMMLXR-NEE,lp4x-spd-2.hex
-K4U6E3S4AA-MGCL,lp4x-spd-1.hex
-K4UBE3D4AA-MGCL,lp4x-spd-3.hex
-MT53E1G32D2NP-046 WT:A,lp4x-spd-4.hex
-MT53E1G32D2NP-046 WT:B,lp4x-spd-3.hex
-H9HKNNNCRMBVAR-NEH,lp4x-spd-5.hex
-MT53E1G64D4SQ-046 WT:A,lp4x-spd-6.hex
-MT53E512M32D2NP-046 WT:F,lp4x-spd-1.hex
-NT6AP256T32AV-J2,lp4x-spd-7.hex
-K4U6E3S4AA-MGCR,lp4x-spd-1.hex
-MT53E512M32D2NP-046 WT:E,lp4x-spd-1.hex
-H9HCNNNCPMMLXR-NEE,lp4x-spd-3.hex
-K4UBE3D4AA-MGCR,lp4x-spd-3.hex
-MT53E512M64D4NW-046 WT:E,lp4x-spd-5.hex
-MT53E1G64D8NW-046 WT:E,lp4x-spd-8.hex
-H9HCNNNCRMBLPR-NEE,lp4x-spd-5.hex
-H9HCNNNFBMBLPR-NEE,lp4x-spd-8.hex
-MT53D1G64D4NW-046 WT:A,lp4x-spd-6.hex
-MT53D512M64D4NW-046 WT:F,lp4x-spd-5.hex
-NT6AP256T32AV-J1,lp4x-spd-9.hex
-MT53E1G32D4NQ-046 WT:E,lp4x-spd-3.hex
-MT53E2G32D4NQ-046 WT:A,lp4x-spd-10.hex
-MT53E512M32D1NP-046 WT:B,lp4x-spd-1.hex
-H54G46CYRBX267,lp4x-spd-1.hex
-H54G56CYRBX247,lp4x-spd-3.hex
-K4U6E3S4AB-MGCL,lp4x-spd-1.hex
-K4UBE3D4AB-MGCL,lp4x-spd-3.hex
diff --git a/src/soc/intel/jasperlake/spd/placeholder.spd.hex b/src/soc/intel/jasperlake/spd/placeholder.spd.hex
deleted file mode 100644
index 67b46cd239..0000000000
--- a/src/soc/intel/jasperlake/spd/placeholder.spd.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 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00