util/mb/google: Update templates to refer to the new spd_tools
Update the new variant templates to refer to the new unified version
of spd_tools:
- Update the comments in mem_parts_used.txt
- Change the placeholder SPD in Makefile.inc to 'placeholder'
BUG=b:191776301
TEST=None
Change-Id: I03265de0d1182da81dd25a2fe6f940a0b82e5fa4
Signed-off-by: Reka Norman <rekanorman@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
diff --git a/util/mainboard/google/brya0/template/memory/Makefile.inc b/util/mainboard/google/brya0/template/memory/Makefile.inc
index b0ca222..6751a42 100644
--- a/util/mainboard/google/brya0/template/memory/Makefile.inc
+++ b/util/mainboard/google/brya0/template/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/util/mainboard/google/brya0/template/memory/mem_parts_used.txt b/util/mainboard/google/brya0/template/memory/mem_parts_used.txt
index 9cff262..9621137 100644
--- a/util/mainboard/google/brya0/template/memory/mem_parts_used.txt
+++ b/util/mainboard/google/brya0/template/memory/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/lp4x.
-# See util/spd_tools/lp4x/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name
diff --git a/util/mainboard/google/dalboz/template/spd/Makefile.inc b/util/mainboard/google/dalboz/template/spd/Makefile.inc
index 3edeb96..6751a42 100644
--- a/util/mainboard/google/dalboz/template/spd/Makefile.inc
+++ b/util/mainboard/google/dalboz/template/spd/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 = ddr4-spd-empty.hex
+SPD_SOURCES = placeholder
diff --git a/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt b/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt
index 8124e4f..416b512 100644
--- a/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt
+++ b/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name, Fixed ID (optional)
diff --git a/util/mainboard/google/guybrush/template/memory/Makefile.inc b/util/mainboard/google/guybrush/template/memory/Makefile.inc
index b0ca222..6751a42 100644
--- a/util/mainboard/google/guybrush/template/memory/Makefile.inc
+++ b/util/mainboard/google/guybrush/template/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/util/mainboard/google/guybrush/template/memory/mem_parts_used.txt b/util/mainboard/google/guybrush/template/memory/mem_parts_used.txt
index 8124e4f..416b512 100644
--- a/util/mainboard/google/guybrush/template/memory/mem_parts_used.txt
+++ b/util/mainboard/google/guybrush/template/memory/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name, Fixed ID (optional)
diff --git a/util/mainboard/google/trembyle/template/spd/Makefile.inc b/util/mainboard/google/trembyle/template/spd/Makefile.inc
index 3edeb96..6751a42 100644
--- a/util/mainboard/google/trembyle/template/spd/Makefile.inc
+++ b/util/mainboard/google/trembyle/template/spd/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 = ddr4-spd-empty.hex
+SPD_SOURCES = placeholder
diff --git a/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt b/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt
index 8124e4f..416b512 100644
--- a/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt
+++ b/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name, Fixed ID (optional)
diff --git a/util/mainboard/google/volteer/template/memory/Makefile.inc b/util/mainboard/google/volteer/template/memory/Makefile.inc
index b0ca222..6751a42 100644
--- a/util/mainboard/google/volteer/template/memory/Makefile.inc
+++ b/util/mainboard/google/volteer/template/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/util/mainboard/google/volteer/template/memory/mem_parts_used.txt b/util/mainboard/google/volteer/template/memory/mem_parts_used.txt
index e4258b5..9621137 100644
--- a/util/mainboard/google/volteer/template/memory/mem_parts_used.txt
+++ b/util/mainboard/google/volteer/template/memory/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name
diff --git a/util/mainboard/google/waddledee/template/memory/Makefile.inc b/util/mainboard/google/waddledee/template/memory/Makefile.inc
index b0ca222..6751a42 100644
--- a/util/mainboard/google/waddledee/template/memory/Makefile.inc
+++ b/util/mainboard/google/waddledee/template/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/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt b/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt
index e4258b5..9621137 100644
--- a/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt
+++ b/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name
diff --git a/util/mainboard/google/waddledoo/template/memory/Makefile.inc b/util/mainboard/google/waddledoo/template/memory/Makefile.inc
index b0ca222..6751a42 100644
--- a/util/mainboard/google/waddledoo/template/memory/Makefile.inc
+++ b/util/mainboard/google/waddledoo/template/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/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt b/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt
index e4258b5..9621137 100644
--- a/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt
+++ b/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt
@@ -5,7 +5,7 @@
# so new parts must always be added at the end of the file!
#
# Generate an updated Makefile.inc and dram_id.generated.txt by running the
-# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
-# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
# Part Name