Rob Barnes has uploaded this change for review.

View Change

util/spd_tools: Support comments in mem_parts_used

Allow comments prefixed with '#' in mem_parts_used csv file.

BUG=None
TEST=Run gen_part_id with mem_parts_used file containing comments

Change-Id: Ia9e274d45aa06dea7a3a5f8cd1c8ee2b23398876
Signed-off-by: Rob Barnes <robbarnes@google.com>
---
M src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
M src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
M util/spd_tools/ddr4/gen_part_id.go
9 files changed, 73 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/44950/1

diff --git a/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
index 69d65d2..a973238 100644
--- a/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/berknip/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 K4A8G165WC-BCTD, 0
 MT40A512M16TB-062E:J, 2
 H5AN8G6NDJR-XNC, 3
diff --git a/src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
index f254851..f24e86b 100644
--- a/src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 HMA851S6CJR6N-VK, 0
 H5ANAG6NCMR-VKC, 1
 K4A8G165WC-BCTD, 2
diff --git a/src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt
index 1d19915..5833b61 100644
--- a/src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/dirinboz/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 K4A8G165WC-BCTD, 2
 K4A8G165WC-BCWE, 4
 H5AN8G6NDJR-XNC, 5
diff --git a/src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
index 27fb51b..92d5fdc 100644
--- a/src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/ezkinil/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 H5AN8G6NCJR-VKC,0
 MT40A512M16TB-062E:J,2
 MT40A1G16KNR-075:E, 3
diff --git a/src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
index b56a6b4..cb9cfff 100644
--- a/src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/morphius/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 K4AAG165WA-BCWE, 0
 MT40A512M16TB-062E:J, 2
 MT40A1G16KD-062E:E, 3
diff --git a/src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
index f8a7229..bb33a61 100644
--- a/src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/trembyle/spd/mem_parts_used.txt
@@ -1,2 +1,11 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 H5AN8G6NCJR-VKC, 0
 H5ANAG6NCMR-VKC, 1
diff --git a/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
index ac7b794b..49c13cb 100644
--- a/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/vilboz/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 H5AN8G6NCJR-VKC, 0
 H5ANAG6NCMR-VKC, 1
 K4A8G165WC-BCWE, 2
diff --git a/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt b/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
index fcee866..61a580a 100644
--- a/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
+++ b/src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
@@ -1,3 +1,12 @@
+# This is a CSV file containg 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.
+# 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.
+
+# Part Name, Fixed ID (optional)
 H5AN8G6NCJR-XNC, 1
 MT40A512M16TB-062E:J, 8
 H5AN8G6NCJR-XNC, 9
diff --git a/util/spd_tools/ddr4/gen_part_id.go b/util/spd_tools/ddr4/gen_part_id.go
index c0098ab..135d5c8 100644
--- a/util/spd_tools/ddr4/gen_part_id.go
+++ b/util/spd_tools/ddr4/gen_part_id.go
@@ -68,6 +68,7 @@
 	r := csv.NewReader(f)
 	r.FieldsPerRecord = -1 // Allow variable length records
 	r.TrimLeadingSpace = true
+	r.Comment = '#'
 
 	parts := []usedPart{}
 

To view, visit change 44950. To unsubscribe, or for help writing mail filters, visit settings.