Martin Roth submitted this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved

mb/google/guybrush: Separate nipperkin and dewatt mem_parts_used table

With the APCB edit tool enabled in commit 6a3ecc5 (guybrush: Inject
SPDs into APCB), DeWatt and Nipperkin can have independent
mem_parts_used tables. Copied common table from guybrush and
ran part_id_gen to make sure it's synced to latest.

BUG=b:209486191
BRANCH=guybrush
TEST=Boot on nipperkin

Change-Id: Id30b596c2466902dfcc59dcc88dcaa00748a3949
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61452
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
---
M src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc
M src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt
A src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt
M src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
M src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt
M src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
M src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt
A src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt
8 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc
index 313feb5..02eafcb 100644
--- a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/dewatt/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/dewatt/memory src/mainboard/google/guybrush/variants/guybrush/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/dewatt/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/dewatt/memory/dram_id.generated.txt b/src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt
index dfd1aac..d574a6f 100644
--- a/src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt
+++ b/src/mainboard/google/guybrush/variants/dewatt/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/dewatt/memory src/mainboard/google/guybrush/variants/guybrush/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/dewatt/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/dewatt/memory/mem_parts_used.txt b/src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt
new file mode 100644
index 0000000..298e58b
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt
@@ -0,0 +1,14 @@
+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
+K4U6E3S4AB-MGCL
+H54G46CYRBX267
+MT53E512M32D1NP-046 WT:B
+H54G56CYRBX247
+K4UBE3D4AB-MGCL
diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
index 9c40489..2b86d00 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
@@ -7,4 +7,4 @@
 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, 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
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL
diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt b/src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt
index 44c16e9..ed9ee86 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt
+++ b/src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt
@@ -16,3 +16,5 @@
 K4U6E3S4AB-MGCL                1 (0001)
 H54G46CYRBX267                 1 (0001)
 MT53E512M32D1NP-046 WT:B       1 (0001)
+H54G56CYRBX247                 3 (0011)
+K4UBE3D4AB-MGCL                3 (0011)
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
index bf8462d..9becda6 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
+++ 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/guybrush/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/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
 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, H54G56CYRBX247
+SPD_SOURCES += spd/lp4x/set-1/spd-3.hex      # ID = 3(0b0011)  Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL
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 3c38550..f85255d 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/guybrush/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/nipperkin/memory/mem_parts_used.txt
 
 DRAM Part Name                 ID to assign
 MT53E1G32D2NP-046 WT:A         0 (0000)
@@ -17,3 +17,4 @@
 H54G46CYRBX267                 1 (0001)
 MT53E512M32D1NP-046 WT:B       1 (0001)
 H54G56CYRBX247                 3 (0011)
+K4UBE3D4AB-MGCL                3 (0011)
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 0000000..298e58b
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt
@@ -0,0 +1,14 @@
+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
+K4U6E3S4AB-MGCL
+H54G46CYRBX267
+MT53E512M32D1NP-046 WT:B
+H54G56CYRBX247
+K4UBE3D4AB-MGCL

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