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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44950
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Rob Barnes 2020-08-31 15:17:38 -06:00 committed by Patrick Georgi
parent eeb4705fff
commit ad1da3a326
9 changed files with 73 additions and 0 deletions

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,2 +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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -1,3 +1,12 @@
# 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.
# 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

View File

@ -68,6 +68,7 @@ func readParts(memPartsUsedFileName string) ([]usedPart, error) {
r := csv.NewReader(f)
r.FieldsPerRecord = -1 // Allow variable length records
r.TrimLeadingSpace = true
r.Comment = '#'
parts := []usedPart{}