From 0c1f737fea6f96bdae36d97ab47ab20f9a8f28d3 Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Fri, 17 Sep 2021 14:44:41 +1000 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57774 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: Furquan Shaikh --- util/mainboard/google/brya0/template/memory/Makefile.inc | 2 +- util/mainboard/google/brya0/template/memory/mem_parts_used.txt | 4 ++-- util/mainboard/google/dalboz/template/spd/Makefile.inc | 2 +- util/mainboard/google/dalboz/template/spd/mem_parts_used.txt | 4 ++-- util/mainboard/google/guybrush/template/memory/Makefile.inc | 2 +- util/mainboard/google/guybrush/template/memory/mem_parts_used.txt | 4 ++-- util/mainboard/google/trembyle/template/spd/Makefile.inc | 2 +- util/mainboard/google/trembyle/template/spd/mem_parts_used.txt | 4 ++-- util/mainboard/google/volteer/template/memory/Makefile.inc | 2 +- util/mainboard/google/volteer/template/memory/mem_parts_used.txt | 4 ++-- util/mainboard/google/waddledee/template/memory/Makefile.inc | 2 +- util/mainboard/google/waddledee/template/memory/mem_parts_used.txt | 4 ++-- util/mainboard/google/waddledoo/template/memory/Makefile.inc | 2 +- util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'util/mainboard/google') diff --git a/util/mainboard/google/brya0/template/memory/Makefile.inc b/util/mainboard/google/brya0/template/memory/Makefile.inc index b0ca2223a8..6751a4283f 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 9cff262f6d..96211370d9 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 3edeb9606c..6751a4283f 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 8124e4f7ed..416b512673 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 b0ca2223a8..6751a4283f 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 8124e4f7ed..416b512673 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 3edeb9606c..6751a4283f 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 8124e4f7ed..416b512673 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 b0ca2223a8..6751a4283f 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 e4258b530d..96211370d9 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 b0ca2223a8..6751a4283f 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 e4258b530d..96211370d9 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 b0ca2223a8..6751a4283f 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 e4258b530d..96211370d9 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 -- cgit v1.2.3