util: volteer/dedede: move generic SPDs to common location

Now that generic SPD files have the memory type prepended to the
filename, they can be stored in the same location.  This CL moves
the generic SPDs to the new location.

Change the ddr4 gen_part_id.go and gen_spd.go tools to use
"ddr4_spd_manifest.generated" instead of "spd_manifest.generated".

Change the lpddr4x gen_part_id.go and gen_spd.go tools to use
"lp4x_spd_manifest.generated" instead of "spd_manifest.generated".

Move TGL DDR4 and LPDDR4x generic SPDs into a common location.

Move JSL DDR4 and LPDDR4x generic SPDs into a common location.

Change the volteer/spd/Makefile.inc to use the new path for the spds.

Change the dedede/spd/Makefile.inc to use the new path for the spds.

BUG=b:165854055
TEST="emerge-volteer coreboot" and verify all variants build correctly.

Change-Id: I83b088cb718d15ffd3012c84a12b5231ae84a3e4
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44648
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

26 files changed, 37 insertions, 38 deletions

diff --git a/src/mainboard/google/dedede/spd/Makefile.inc b/src/mainboard/google/dedede/spd/Makefile.inc
index d2bed28dbc3b..bcfe06d79eb2 100644
--- a/src/mainboard/google/dedede/spd/Makefile.inc
+++ b/src/mainboard/google/dedede/spd/Makefile.inc
@@ -3,7 +3,7 @@
 ifneq ($(SPD_SOURCES),)
 SPD_BIN = $(obj)/spd.bin
 
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/soc/intel/jasperlake/spd/lp4x/$(f))
+SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/soc/intel/jasperlake/spd/$(f))
 
 # Include spd ROM data
 $(SPD_BIN): $(SPD_DEPS)
diff --git a/src/mainboard/google/volteer/spd/Makefile.inc b/src/mainboard/google/volteer/spd/Makefile.inc
index 1077a36ae0d5..2dfafd5cd8ab 100644
--- a/src/mainboard/google/volteer/spd/Makefile.inc
+++ b/src/mainboard/google/volteer/spd/Makefile.inc
@@ -5,7 +5,7 @@ ifneq ($(SPD_SOURCES),)
 SPD_BIN = $(obj)/spd.bin
 
 ifeq ($(SPD_SOURCE_PATH),)
-SPD_SOURCE_PATH := src/soc/intel/tigerlake/spd/lp4x
+SPD_SOURCE_PATH := src/soc/intel/tigerlake/spd
 endif
 
 SPD_DEPS := $(foreach f, $(SPD_SOURCES), $(SPD_SOURCE_PATH)/$(f))
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 564322e9e5aa..000000000000
--- a/src/soc/intel/jasperlake/spd/lp4x/spd_manifest.generated.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-H9HCNNNBKMMLXR-NEE,spd-1.hex
-H9HCNNNFAMMLXR-NEE,spd-2.hex
-K4U6E3S4AA-MGCL,spd-1.hex
-K4UBE3D4AA-MGCL,spd-3.hex
-MT53E1G32D2NP-046 WT:A,spd-4.hex
-H9HKNNNCRMBVAR-NEH,spd-5.hex
-MT53E1G64D4SQ-046 WT:A,spd-6.hex
-MT53E512M32D2NP-046 WT:F,spd-1.hex
-NT6AP256T32AV-J2,spd-7.hex
-K4U6E3S4AA-MGCR,spd-1.hex
-MT53E512M32D2NP-046 WT:E,spd-1.hex
-H9HCNNNCPMMLXR-NEE,spd-3.hex
-K4UBE3D4AA-MGCR,spd-3.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt b/src/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt
new file mode 100644
index 000000000000..a0089f3fc0ff
--- /dev/null
+++ b/src/soc/intel/jasperlake/spd/lp4x_spd_manifest.generated.txt
@@ -0,0 +1,13 @@
+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
+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
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-1.hex b/src/soc/intel/jasperlake/spd/spd-1.hex
index 50f50e234870..50f50e234870 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-1.hex
+++ b/src/soc/intel/jasperlake/spd/spd-1.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-2.hex b/src/soc/intel/jasperlake/spd/spd-2.hex
index 866b466d66aa..866b466d66aa 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-2.hex
+++ b/src/soc/intel/jasperlake/spd/spd-2.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-3.hex b/src/soc/intel/jasperlake/spd/spd-3.hex
index 6db2d80aeca9..6db2d80aeca9 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-3.hex
+++ b/src/soc/intel/jasperlake/spd/spd-3.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-4.hex b/src/soc/intel/jasperlake/spd/spd-4.hex
index c4180b613c01..c4180b613c01 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-4.hex
+++ b/src/soc/intel/jasperlake/spd/spd-4.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-5.hex b/src/soc/intel/jasperlake/spd/spd-5.hex
index 77230e7a1465..77230e7a1465 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-5.hex
+++ b/src/soc/intel/jasperlake/spd/spd-5.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-6.hex b/src/soc/intel/jasperlake/spd/spd-6.hex
index 8da34f100e84..8da34f100e84 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-6.hex
+++ b/src/soc/intel/jasperlake/spd/spd-6.hex
diff --git a/src/soc/intel/jasperlake/spd/lp4x/spd-7.hex b/src/soc/intel/jasperlake/spd/spd-7.hex
index 2fe6757d9d5a..2fe6757d9d5a 100644
--- a/src/soc/intel/jasperlake/spd/lp4x/spd-7.hex
+++ b/src/soc/intel/jasperlake/spd/spd-7.hex
diff --git a/src/soc/intel/tigerlake/spd/ddr4/ddr4-spd-1.hex b/src/soc/intel/tigerlake/spd/ddr4-spd-1.hex
index 32d141f21f98..32d141f21f98 100644
--- a/src/soc/intel/tigerlake/spd/ddr4/ddr4-spd-1.hex
+++ b/src/soc/intel/tigerlake/spd/ddr4-spd-1.hex
diff --git a/src/soc/intel/tigerlake/spd/ddr4/ddr4-spd-2.hex b/src/soc/intel/tigerlake/spd/ddr4-spd-2.hex
index 15e4d3fcf125..15e4d3fcf125 100644
--- a/src/soc/intel/tigerlake/spd/ddr4/ddr4-spd-2.hex
+++ b/src/soc/intel/tigerlake/spd/ddr4-spd-2.hex
diff --git a/src/soc/intel/tigerlake/spd/ddr4/spd_manifest.generated.txt b/src/soc/intel/tigerlake/spd/ddr4_spd_manifest.generated.txt
index 22fce5c30248..22fce5c30248 100644
--- a/src/soc/intel/tigerlake/spd/ddr4/spd_manifest.generated.txt
+++ b/src/soc/intel/tigerlake/spd/ddr4_spd_manifest.generated.txt
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd_manifest.generated.txt b/src/soc/intel/tigerlake/spd/lp4x/spd_manifest.generated.txt
deleted file mode 100644
index f57b372baca9..000000000000
--- a/src/soc/intel/tigerlake/spd/lp4x/spd_manifest.generated.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-H9HCNNNBKMMLXR-NEE,spd-1.hex
-H9HCNNNFAMMLXR-NEE,spd-2.hex
-K4U6E3S4AA-MGCL,spd-1.hex
-K4UBE3D4AA-MGCL,spd-3.hex
-MT53E1G32D2NP-046 WT:A,spd-4.hex
-H9HKNNNCRMBVAR-NEH,spd-1.hex
-MT53E1G64D4SQ-046 WT:A,spd-4.hex
-MT53E512M32D2NP-046 WT:F,spd-1.hex
-NT6AP256T32AV-J2,spd-5.hex
-K4U6E3S4AA-MGCR,spd-1.hex
-MT53E512M32D2NP-046 WT:E,spd-1.hex
-H9HCNNNCPMMLXR-NEE,spd-3.hex
-K4UBE3D4AA-MGCR,spd-3.hex
-MT53E512M64D4NW-046 WT:E,spd-1.hex
-MT53E1G64D8NW-046 WT:E,spd-3.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x_spd_manifest.generated.txt b/src/soc/intel/tigerlake/spd/lp4x_spd_manifest.generated.txt
new file mode 100644
index 000000000000..70877d2c3559
--- /dev/null
+++ b/src/soc/intel/tigerlake/spd/lp4x_spd_manifest.generated.txt
@@ -0,0 +1,15 @@
+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
+H9HKNNNCRMBVAR-NEH,lp4x-spd-1.hex
+MT53E1G64D4SQ-046 WT:A,lp4x-spd-4.hex
+MT53E512M32D2NP-046 WT:F,lp4x-spd-1.hex
+NT6AP256T32AV-J2,lp4x-spd-5.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-1.hex
+MT53E1G64D8NW-046 WT:E,lp4x-spd-3.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd-1.hex b/src/soc/intel/tigerlake/spd/spd-1.hex
index 3fc750507b71..3fc750507b71 100644
--- a/src/soc/intel/tigerlake/spd/lp4x/spd-1.hex
+++ b/src/soc/intel/tigerlake/spd/spd-1.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd-2.hex b/src/soc/intel/tigerlake/spd/spd-2.hex
index 7995d4c652f7..7995d4c652f7 100644
--- a/src/soc/intel/tigerlake/spd/lp4x/spd-2.hex
+++ b/src/soc/intel/tigerlake/spd/spd-2.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd-3.hex b/src/soc/intel/tigerlake/spd/spd-3.hex
index d4cf7efdfd77..d4cf7efdfd77 100644
--- a/src/soc/intel/tigerlake/spd/lp4x/spd-3.hex
+++ b/src/soc/intel/tigerlake/spd/spd-3.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd-4.hex b/src/soc/intel/tigerlake/spd/spd-4.hex
index c4e5b503b1c2..c4e5b503b1c2 100644
--- a/src/soc/intel/tigerlake/spd/lp4x/spd-4.hex
+++ b/src/soc/intel/tigerlake/spd/spd-4.hex
diff --git a/src/soc/intel/tigerlake/spd/lp4x/spd-5.hex b/src/soc/intel/tigerlake/spd/spd-5.hex
index e31337d5fc45..e31337d5fc45 100644
--- a/src/soc/intel/tigerlake/spd/lp4x/spd-5.hex
+++ b/src/soc/intel/tigerlake/spd/spd-5.hex
diff --git a/util/spd_tools/ddr4/README.md b/util/spd_tools/ddr4/README.md
index 7921f48a5dc8..81ab97a80a04 100644
--- a/util/spd_tools/ddr4/README.md
+++ b/util/spd_tools/ddr4/README.md
@@ -175,7 +175,7 @@ memory parts in JSON format as described above:
     and placed in the directory provided as an input to the tool.
   * CSV file representing which of the deduplicated SPD files is used
     by which memory part. This file is named as
-    `spd_manifest.generated.txt` and placed in the directory provided
+    `ddr4_spd_manifest.generated.txt` and placed in the directory provided
     as an input to the tool along with the generated SPD
     files. Example CSV file:
     ```
@@ -190,7 +190,7 @@ memory parts in JSON format as described above:
 
 This program takes as input:
 * Pointer to directory where the SPD files and the manifest file
-  `spd_manifest.generated.txt` (in CSV format) are placed by
+  `ddr4_spd_manifest.generated.txt` (in CSV format) are placed by
   gen_spd.go
 * File containing list of memory parts used by the board. Each line of
   the file is supposed to contain one memory part `name` as present in
diff --git a/util/spd_tools/ddr4/gen_part_id.go b/util/spd_tools/ddr4/gen_part_id.go
index f67b4a9434af..e0adaaf9941a 100644
--- a/util/spd_tools/ddr4/gen_part_id.go
+++ b/util/spd_tools/ddr4/gen_part_id.go
@@ -25,7 +25,7 @@ import (
  *  is expected to have one memory part name.
  */
 const (
-	SPDManifestFileName = "spd_manifest.generated.txt"
+	SPDManifestFileName = "ddr4_spd_manifest.generated.txt"
 	MakefileName = "Makefile.inc"
 	DRAMIdFileName = "dram_id.generated.txt"
 )
@@ -174,7 +174,6 @@ func genMakefile(partIdList []partIds, makefileDirName string) error {
 	var s string
 
 	s += fmt.Sprintf("%s\n%s\n\n", generatedCodeLicense, autoGeneratedInfo)
-	s += fmt.Sprintf("MEMORY_TYPE = ddr4\n\n")
 	s += fmt.Sprintf("SPD_SOURCES =\n")
 
 	for i := 0; i < len(partIdList); i++ {
diff --git a/util/spd_tools/ddr4/gen_spd.go b/util/spd_tools/ddr4/gen_spd.go
index e99239acd23e..99fae7d3b4ad 100644
--- a/util/spd_tools/ddr4/gen_spd.go
+++ b/util/spd_tools/ddr4/gen_spd.go
@@ -26,7 +26,7 @@ import (
  * JSON file containing a list of memory parts with their attributes as per datasheet.
  */
 const (
-	SPDManifestFileName = "spd_manifest.generated.txt"
+	SPDManifestFileName = "ddr4_spd_manifest.generated.txt"
 
 	PlatformTGL = 0
 	PlatformPCO = 1
diff --git a/util/spd_tools/lp4x/gen_part_id.go b/util/spd_tools/lp4x/gen_part_id.go
index 7ed255c83bd7..603798160569 100644
--- a/util/spd_tools/lp4x/gen_part_id.go
+++ b/util/spd_tools/lp4x/gen_part_id.go
@@ -25,7 +25,7 @@ import (
  *  is expected to have one memory part name.
  */
 const (
-	SPDManifestFileName = "spd_manifest.generated.txt"
+	SPDManifestFileName = "lp4x_spd_manifest.generated.txt"
 	MakefileName = "Makefile.inc"
 	DRAMIdFileName = "dram_id.generated.txt"
 )
diff --git a/util/spd_tools/lp4x/gen_spd.go b/util/spd_tools/lp4x/gen_spd.go
index 2465815e49ff..e63ca8df6fc2 100644
--- a/util/spd_tools/lp4x/gen_spd.go
+++ b/util/spd_tools/lp4x/gen_spd.go
@@ -25,7 +25,7 @@ import (
  * JSON file containing a list of memory parts with their attributes as per datasheet.
  */
 const (
-	SPDManifestFileName = "spd_manifest.generated.txt"
+	SPDManifestFileName = "lp4x_spd_manifest.generated.txt"
 
 	PlatformTGL = 0
 	PlatformJSL = 1
@@ -666,7 +666,7 @@ func dedupeMemoryPart(dedupedParts []*memPart, memPart *memPart) bool {
 
 func generateSPD(memPart *memPart, SPDId int, SPDDirName string) {
 	s := createSPD(&memPart.Attribs)
-	memPart.SPDFileName = fmt.Sprintf("spd-%d.hex", SPDId)
+	memPart.SPDFileName = fmt.Sprintf("lp4x-spd-%d.hex", SPDId)
 	ioutil.WriteFile(filepath.Join(SPDDirName, memPart.SPDFileName), []byte(s), 0644)
 }