mb/google/guybrush: Combine mem_parts_used.txt

Combine guybrush mem_parts_used.txt across guybrush variants. Guybrush
reference memory parts is used as the base, then Nipperkin memory
parts were appended, followed by DeWatt memory parts. Duplicates were
removed.

The memory id mapping was not affected on guybrush reference and
Nipperkin. DeWatt memory id mapping was affected, DeWatt boards will
need to be adjusted.

This works around a limitation in APCB, which currently only supports
one set of memory SPDs.

BUG=b:209486790, b:204151079
BRANCH=None
TEST=Boot guybrush and nipperkin

Change-Id: Ie17025e092f2b9397afea33fce285e80ef5dc995
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59923
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>

src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc

@@ -1,8 +1,10 @@
 # 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/dewatt/memory src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt
+# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/dewatt/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt
 
 SPD_SOURCES =
-SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 0(0b0000)  Parts = K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 0(0b0000)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-9.hex      # ID = 2(0b0010)  Parts = NT6AP256T32AV-J1
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR

src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt

@@ -1,10 +1,18 @@
 # 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/dewatt/memory src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt
+# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/dewatt/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt
 
 DRAM Part Name                 ID to assign
-K4U6E3S4AB-MGCL                0 (0000)
+MT53E1G32D2NP-046 WT:A         0 (0000)
-H54G46CYRBX267                 0 (0000)
+MT53E512M32D2NP-046 WT:F       1 (0001)
-MT53E1G32D2NP-046 WT:B         1 (0001)
+NT6AP256T32AV-J1               2 (0010)
-MT53E512M32D1NP-046 WT:B       0 (0000)
+H9HCNNNBKMMLXR-NEE             1 (0001)
+MT53E1G32D2NP-046 WT:B         3 (0011)
+MT53E512M32D2NP-046 WT:E       1 (0001)
+K4U6E3S4AA-MGCR                1 (0001)
+H9HCNNNCPMMLXR-NEE             3 (0011)
+K4UBE3D4AA-MGCR                3 (0011)
+K4U6E3S4AB-MGCL                1 (0001)
+H54G46CYRBX267                 1 (0001)
+MT53E512M32D1NP-046 WT:B       1 (0001)

src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt

@@ -1,4 +0,0 @@
-K4U6E3S4AB-MGCL
-H54G46CYRBX267
-MT53E1G32D2NP-046 WT:B
-MT53E512M32D1NP-046 WT:B

src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc

@@ -5,6 +5,6 @@
 
 SPD_SOURCES =
 SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 0(0b0000)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B
 SPD_SOURCES += spd/lp4x/set-1/spd-9.hex      # ID = 2(0b0010)  Parts = NT6AP256T32AV-J1
-SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR

src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt

@@ -9,3 +9,10 @@ MT53E512M32D2NP-046 WT:F       1 (0001)
 NT6AP256T32AV-J1               2 (0010)
 H9HCNNNBKMMLXR-NEE             1 (0001)
 MT53E1G32D2NP-046 WT:B         3 (0011)
+MT53E512M32D2NP-046 WT:E       1 (0001)
+K4U6E3S4AA-MGCR                1 (0001)
+H9HCNNNCPMMLXR-NEE             3 (0011)
+K4UBE3D4AA-MGCR                3 (0011)
+K4U6E3S4AB-MGCL                1 (0001)
+H54G46CYRBX267                 1 (0001)
+MT53E512M32D1NP-046 WT:B       1 (0001)

src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt

@@ -3,3 +3,10 @@ MT53E512M32D2NP-046 WT:F
 NT6AP256T32AV-J1
 H9HCNNNBKMMLXR-NEE
 MT53E1G32D2NP-046 WT:B
+MT53E512M32D2NP-046 WT:E
+K4U6E3S4AA-MGCR
+H9HCNNNCPMMLXR-NEE
+K4UBE3D4AA-MGCR
+K4U6E3S4AB-MGCL
+H54G46CYRBX267
+MT53E512M32D1NP-046 WT:B

src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc

@@ -1,10 +1,10 @@
 # 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_parts_used.txt
+# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt
 
 SPD_SOURCES =
 SPD_SOURCES += spd/lp4x/set-1/spd-4.hex      # ID = 0(0b0000)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR
+SPD_SOURCES += spd/lp4x/set-1/spd-1.hex      # ID = 1(0b0001)  Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B
 SPD_SOURCES += spd/lp4x/set-1/spd-9.hex      # ID = 2(0b0010)  Parts = NT6AP256T32AV-J1
 SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR

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_parts_used.txt
+# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt
 
 DRAM Part Name                 ID to assign
 MT53E1G32D2NP-046 WT:A         0 (0000)
@@ -13,3 +13,6 @@ MT53E512M32D2NP-046 WT:E       1 (0001)
 K4U6E3S4AA-MGCR                1 (0001)
 H9HCNNNCPMMLXR-NEE             3 (0011)
 K4UBE3D4AA-MGCR                3 (0011)
+K4U6E3S4AB-MGCL                1 (0001)
+H54G46CYRBX267                 1 (0001)
+MT53E512M32D1NP-046 WT:B       1 (0001)

src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt

@@ -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