Chris Wang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59920 )
Change subject: mb/google/guybrush: update DRAM ID table for all variants ......................................................................
mb/google/guybrush: update DRAM ID table for all variants
We use the fixed DRAM strap pin for APCB and it crosses all guybrush variants. This change will move all the mem_parts_used.txt to baseboard and use the unify mem_parts_used.txt for all variants to avoid people being confused.
BUG=b:203014978 BRANCH=none TEST=emerge-guybrush coreboot chromeos-bootimage and boot to dewatt successfully
Signed-off-by: Chris Wang chris.wang@amd.corp-partner.google.com Change-Id: I9cc21f1a032e97cf30d7eb072bbf6894c01e8bbc --- M src/mainboard/google/guybrush/variants/dewatt/Makefile.inc D src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc D src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt D src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt M src/mainboard/google/guybrush/variants/guybrush/Makefile.inc D src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc D src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt D src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt M src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc D src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc D src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt D src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt 12 files changed, 3 insertions(+), 85 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/59920/1
diff --git a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc index 88e75bd..f840dfa 100644 --- a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc +++ b/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-or-later
-subdirs-y += ./memory +subdirs-y += ../baseboard/memory diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc deleted file mode 100644 index 069b2eb..0000000 --- a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -# 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 - -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-3.hex # ID = 1(0b0001) Parts = MT53E1G32D2NP-046 WT:B 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 deleted file mode 100644 index 5ce9e79..0000000 --- a/src/mainboard/google/guybrush/variants/dewatt/memory/dram_id.generated.txt +++ /dev/null @@ -1,10 +0,0 @@ -# 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 - -DRAM Part Name ID to assign -K4U6E3S4AB-MGCL 0 (0000) -H54G46CYRBX267 0 (0000) -MT53E1G32D2NP-046 WT:B 1 (0001) -MT53E512M32D1NP-046 WT:B 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 deleted file mode 100644 index 4b6ba22..0000000 --- a/src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt +++ /dev/null @@ -1,4 +0,0 @@ -K4U6E3S4AB-MGCL -H54G46CYRBX267 -MT53E1G32D2NP-046 WT:B -MT53E512M32D1NP-046 WT:B diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc index fa2c4de..801e350 100644 --- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc +++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc @@ -11,6 +11,6 @@
verstage-y += gpio.c
-subdirs-y += ./memory +subdirs-y += ../baseboard/memory
smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc deleted file mode 100644 index 5af83ad..0000000 --- a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# 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/guybrush/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 -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 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 deleted file mode 100644 index 02c1bf3..0000000 --- a/src/mainboard/google/guybrush/variants/guybrush/memory/dram_id.generated.txt +++ /dev/null @@ -1,11 +0,0 @@ -# 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/guybrush/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt - -DRAM Part Name ID to assign -MT53E1G32D2NP-046 WT:A 0 (0000) -MT53E512M32D2NP-046 WT:F 1 (0001) -NT6AP256T32AV-J1 2 (0010) -H9HCNNNBKMMLXR-NEE 1 (0001) -MT53E1G32D2NP-046 WT:B 3 (0011) diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt b/src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt deleted file mode 100644 index b267e53..0000000 --- a/src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt +++ /dev/null @@ -1,5 +0,0 @@ -MT53E1G32D2NP-046 WT:A -MT53E512M32D2NP-046 WT:F -NT6AP256T32AV-J1 -H9HCNNNBKMMLXR-NEE -MT53E1G32D2NP-046 WT:B diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc index d7ec6dd..f6a771b 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc +++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc @@ -11,6 +11,6 @@
ramstage-y += ramstage.c
-subdirs-y += ./memory +subdirs-y += ../baseboard/memory
smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc deleted file mode 100644 index b2a552c..0000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# 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 - -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-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 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 deleted file mode 100644 index af5e980..0000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt +++ /dev/null @@ -1,15 +0,0 @@ -# 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 - -DRAM Part Name ID to assign -MT53E1G32D2NP-046 WT:A 0 (0000) -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) 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 deleted file mode 100644 index eb702a6..0000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.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