diff options
author | Nick Vaccaro <nvaccaro@google.com> | 2020-08-20 16:19:44 -0700 |
---|---|---|
committer | Aaron Durbin <adurbin@chromium.org> | 2020-08-28 04:35:56 +0000 |
commit | 48fc1640a83ce55aa1d7cc94298d3778116587e6 (patch) | |
tree | 124bbb85ebd0de8aeaa083fb29c252853e4e8d2b /util/spd_tools/lp4x | |
parent | c19140b49f1972cb3b0be5467a4c8a735226bb90 (diff) |
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>
Diffstat (limited to 'util/spd_tools/lp4x')
-rw-r--r-- | util/spd_tools/lp4x/gen_part_id.go | 2 | ||||
-rw-r--r-- | util/spd_tools/lp4x/gen_spd.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/spd_tools/lp4x/gen_part_id.go b/util/spd_tools/lp4x/gen_part_id.go index 7ed255c83b..6037981605 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 2465815e49..e63ca8df6f 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) } |