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 --- .../google/guybrush/variants/nipperkin/memory/Makefile.inc | 2 +- .../guybrush/variants/nipperkin/memory/dram_id.generated.txt | 2 +- .../guybrush/variants/nipperkin/memory/mem_list_variant.txt | 9 --------- .../google/guybrush/variants/nipperkin/memory/mem_parts_used.txt | 9 +++++++++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt create mode 100644 src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt (limited to 'src/mainboard/google/guybrush/variants/nipperkin') diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc index 0340db8fb0..b2a552c04c 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc +++ b/src/mainboard/google/guybrush/variants/nipperkin/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 CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt +# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt SPD_SOURCES = SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt b/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt index 47104f9a92..af5e9806f7 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt +++ b/src/mainboard/google/guybrush/variants/nipperkin/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 CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt +# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt DRAM Part Name ID to assign MT53E1G32D2NP-046 WT:A 0 (0000) diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt deleted file mode 100644 index eb702a6274..0000000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_list_variant.txt +++ /dev/null @@ -1,9 +0,0 @@ -MT53E1G32D2NP-046 WT:A -MT53E512M32D2NP-046 WT:F -NT6AP256T32AV-J1 -H9HCNNNBKMMLXR-NEE -MT53E1G32D2NP-046 WT:B -MT53E512M32D2NP-046 WT:E -K4U6E3S4AA-MGCR -H9HCNNNCPMMLXR-NEE -K4UBE3D4AA-MGCR diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt new file mode 100644 index 0000000000..eb702a6274 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt @@ -0,0 +1,9 @@ +MT53E1G32D2NP-046 WT:A +MT53E512M32D2NP-046 WT:F +NT6AP256T32AV-J1 +H9HCNNNBKMMLXR-NEE +MT53E1G32D2NP-046 WT:B +MT53E512M32D2NP-046 WT:E +K4U6E3S4AA-MGCR +H9HCNNNCPMMLXR-NEE +K4UBE3D4AA-MGCR -- cgit v1.2.3