From 6c411e6a39e3ea8b35ab2a99c16b6afc6bb32140 Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Wed, 22 Sep 2021 11:01:32 +1000 Subject: mb/google: Bulk rename mem_list_variant.txt to mem_parts_used.txt The variant creation script creates a placeholder file called mem_parts_used.txt, with the intent that variant owners will populate this file with memory parts as needed. But instead, some partners have been adding the parts in a new file called mem_list_variant.txt and removing the placeholder file. E.g. https://review.coreboot.org/55735. There's nothing wrong with this, but it's confusing to have two different file names which serve the same purpose. Bulk rename all the mem_list_variant.txt files to mem_parts_used.txt. The only time these file names are used is as an argument to the spd_tools part_id_gen script, so no other changes are necessary. BUG=None TEST=Re-run part_id_gen for all variants of brya/volteer/dedede/guybrush/zork. Check that the only change is to the "Generated by" comment in Makefile.inc and dram_id.generated.txt. Signed-off-by: Reka Norman Change-Id: Icdeee78ae5c01e97f66c759c127175b4962d5635 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57820 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc | 2 +- .../google/volteer/variants/drobit/memory/dram_id.generated.txt | 2 +- .../google/volteer/variants/drobit/memory/mem_list_variant.txt | 4 ---- .../google/volteer/variants/drobit/memory/mem_parts_used.txt | 4 ++++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt create mode 100644 src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt (limited to 'src/mainboard/google/volteer/variants/drobit') diff --git a/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc b/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc index 93b5773214..f419943d90 100644 --- a/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc +++ b/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # This is an auto-generated file. Do not edit!! # Generated by: -# util/spd_tools/bin/part_id_gen TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt +# util/spd_tools/bin/part_id_gen TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt SPD_SOURCES = SPD_SOURCES += spd/lp4x/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT53E512M32D2NP-046 WT:E, H9HCNNNBKMMLXR-NEE diff --git a/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt index 7ef3a1d887..62dad8009c 100644 --- a/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt +++ b/src/mainboard/google/volteer/variants/drobit/memory/dram_id.generated.txt @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # This is an auto-generated file. Do not edit!! # Generated by: -# util/spd_tools/bin/part_id_gen TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt +# util/spd_tools/bin/part_id_gen TGL lp4x src/mainboard/google/volteer/variants/drobit/memory src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt DRAM Part Name ID to assign MT53E512M32D2NP-046 WT:E 0 (0000) diff --git a/src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt b/src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt deleted file mode 100644 index b99b811053..0000000000 --- a/src/mainboard/google/volteer/variants/drobit/memory/mem_list_variant.txt +++ /dev/null @@ -1,4 +0,0 @@ -MT53E512M32D2NP-046 WT:E -MT53E1G32D2NP-046 WT:A -H9HCNNNBKMMLXR-NEE -H9HCNNNCPMMLXR-NEE diff --git a/src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt b/src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt new file mode 100644 index 0000000000..b99b811053 --- /dev/null +++ b/src/mainboard/google/volteer/variants/drobit/memory/mem_parts_used.txt @@ -0,0 +1,4 @@ +MT53E512M32D2NP-046 WT:E +MT53E1G32D2NP-046 WT:A +H9HCNNNBKMMLXR-NEE +H9HCNNNCPMMLXR-NEE -- cgit v1.2.3