From 259cccd7e7faf23047b9fe9fb551f27c8fd4ee27 Mon Sep 17 00:00:00 2001 From: Paul Fagerburg Date: Tue, 9 Feb 2021 13:04:55 -0700 Subject: mb/google: order matters in mem_parts_used.txt * Add comments to mem_parts_used.txt to point out that the order of the entries matters when assigning IDs, so always add a new part to the end of the file. * Update existing mem_parts_used.txt to add the same comment. * No updates to Zork variants, because they use an optional ID, so the order actually doesn't matter there. BUG=b:175898902 TEST=create a new variant of dalboz, trembyle, volteer, waddledee, or waddledoo, and observe that mem_parts_used.txt has the new verbiage. Signed-off-by: Paul Fagerburg Change-Id: Iffbd8e69a89b1b7c810c5d25c7a6148d459d8b02 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50449 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Rob Barnes --- util/mainboard/google/dalboz/template/spd/mem_parts_used.txt | 8 +++++--- util/mainboard/google/trembyle/template/spd/mem_parts_used.txt | 8 +++++--- util/mainboard/google/volteer/template/memory/mem_parts_used.txt | 9 ++++++++- .../google/waddledee/template/memory/mem_parts_used.txt | 9 +++++++-- .../google/waddledoo/template/memory/mem_parts_used.txt | 9 +++++++-- 5 files changed, 32 insertions(+), 11 deletions(-) (limited to 'util') 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 106a705a36..8124e4f7ed 100644 --- a/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt +++ b/util/mainboard/google/dalboz/template/spd/mem_parts_used.txt @@ -1,9 +1,11 @@ # This is a CSV file containing a list of memory parts used by this variant. # One part per line with an optional fixed ID in column 2. # Only include a fixed ID if it is required for legacy reasons! -# Each part must also be listed in util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt. +# Generated IDs are dependent on the order of parts in this file, +# 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. -# See util/spd_tools/ddr4/README.md for more details and instructions. +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. +# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. # Part Name, Fixed ID (optional) 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 106a705a36..8124e4f7ed 100644 --- a/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt +++ b/util/mainboard/google/trembyle/template/spd/mem_parts_used.txt @@ -1,9 +1,11 @@ # This is a CSV file containing a list of memory parts used by this variant. # One part per line with an optional fixed ID in column 2. # Only include a fixed ID if it is required for legacy reasons! -# Each part must also be listed in util/spd_tools/ddr4/global_ddr4_mem_parts.json.txt. +# Generated IDs are dependent on the order of parts in this file, +# 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. -# See util/spd_tools/ddr4/README.md for more details and instructions. +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. +# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. # Part Name, Fixed ID (optional) 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 f51b3af398..e4258b530d 100644 --- a/util/mainboard/google/volteer/template/memory/mem_parts_used.txt +++ b/util/mainboard/google/volteer/template/memory/mem_parts_used.txt @@ -1,4 +1,11 @@ # This is a CSV file containing a list of memory parts used by this variant. +# One part per line with an optional fixed ID in column 2. +# Only include a fixed ID if it is required for legacy reasons! +# Generated IDs are dependent on the order of parts in this file, +# 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 or util/spd_tools/lp4x +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. # See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. + +# Part Name 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 59381dcf5b..e4258b530d 100644 --- a/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt +++ b/util/mainboard/google/waddledee/template/memory/mem_parts_used.txt @@ -1,6 +1,11 @@ # This is a CSV file containing a list of memory parts used by this variant. +# One part per line with an optional fixed ID in column 2. +# Only include a fixed ID if it is required for legacy reasons! +# Generated IDs are dependent on the order of parts in this file, +# 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. +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. +# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. # Part Name 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 59381dcf5b..e4258b530d 100644 --- a/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt +++ b/util/mainboard/google/waddledoo/template/memory/mem_parts_used.txt @@ -1,6 +1,11 @@ # This is a CSV file containing a list of memory parts used by this variant. +# One part per line with an optional fixed ID in column 2. +# Only include a fixed ID if it is required for legacy reasons! +# Generated IDs are dependent on the order of parts in this file, +# 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. +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. +# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. # Part Name -- cgit v1.2.3