From 9a9d10f7f5dc48037c1b38324dee3d8e673fcb67 Mon Sep 17 00:00:00 2001
From: Ren Kuo <ren.kuo@quanta.corp-partner.google.com>
Date: Wed, 12 Aug 2020 11:23:29 +0800
Subject: mb/google/dedede/var/magolor: Generate SPD ID for supported parts

Add supported memory parts in the mem_list_variant.txt and generate the
SPD ID for the parts. The memory parts being added are:
MT53E512M32D2NP-046 WT:E
K4U6E3S4AA-MGCR
H9HCNNNBKMMLXR-NEE
MT53E1G32D2NP-046 WT:A
K4UBE3D4AA-MGCR

And also remove the deprecated by cl#43989
https://review.coreboot.org/c/coreboot/+/43989

BUG=None
TEST=Build the magolor board

Signed-off-by: Ren Kuo <ren.kuo@quanta.corp-partner.google.com>
Change-Id: I3348b7fbeff038b85e7d3c9137517e05a35bf3dd
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44408
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Marco Chen <marcochen@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/dedede/variants/magalor/memory/Makefile.inc   | 7 -------
 .../google/dedede/variants/magalor/memory/dram_id.generated.txt    | 6 ------
 .../google/dedede/variants/magalor/memory/mem_list_variant.txt     | 5 -----
 src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc   | 7 +++++++
 .../google/dedede/variants/magolor/memory/dram_id.generated.txt    | 6 ++++++
 .../google/dedede/variants/magolor/memory/mem_list_variant.txt     | 5 +++++
 6 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 src/mainboard/google/dedede/variants/magalor/memory/Makefile.inc
 delete mode 100644 src/mainboard/google/dedede/variants/magalor/memory/dram_id.generated.txt
 delete mode 100644 src/mainboard/google/dedede/variants/magalor/memory/mem_list_variant.txt
 create mode 100644 src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
 create mode 100644 src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt
 create mode 100644 src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt

diff --git a/src/mainboard/google/dedede/variants/magalor/memory/Makefile.inc b/src/mainboard/google/dedede/variants/magalor/memory/Makefile.inc
deleted file mode 100644
index bab4f2ad22..0000000000
--- a/src/mainboard/google/dedede/variants/magalor/memory/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-or-later
-## This is an auto-generated file. Do not edit!!
-
-SPD_SOURCES =
-SPD_SOURCES += spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
-SPD_SOURCES += spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
-SPD_SOURCES += spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/magalor/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/magalor/memory/dram_id.generated.txt
deleted file mode 100644
index 100c322e91..0000000000
--- a/src/mainboard/google/dedede/variants/magalor/memory/dram_id.generated.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-DRAM Part Name                 ID to assign
-MT53E512M32D2NP-046 WT:E       0 (0000)
-K4U6E3S4AA-MGCR                0 (0000)
-H9HCNNNBKMMLXR-NEE             0 (0000)
-MT53E1G32D2NP-046 WT:A         1 (0001)
-K4UBE3D4AA-MGCR                2 (0010)
diff --git a/src/mainboard/google/dedede/variants/magalor/memory/mem_list_variant.txt b/src/mainboard/google/dedede/variants/magalor/memory/mem_list_variant.txt
deleted file mode 100644
index f05a5af118..0000000000
--- a/src/mainboard/google/dedede/variants/magalor/memory/mem_list_variant.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-MT53E512M32D2NP-046 WT:E
-K4U6E3S4AA-MGCR
-H9HCNNNBKMMLXR-NEE
-MT53E1G32D2NP-046 WT:A
-K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc b/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
new file mode 100644
index 0000000000..bab4f2ad22
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
@@ -0,0 +1,7 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+## This is an auto-generated file. Do not edit!!
+
+SPD_SOURCES =
+SPD_SOURCES += spd-1.hex      # ID = 0(0b0000)  Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += spd-4.hex      # ID = 1(0b0001)  Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += spd-3.hex      # ID = 2(0b0010)  Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt
new file mode 100644
index 0000000000..100c322e91
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/magolor/memory/dram_id.generated.txt
@@ -0,0 +1,6 @@
+DRAM Part Name                 ID to assign
+MT53E512M32D2NP-046 WT:E       0 (0000)
+K4U6E3S4AA-MGCR                0 (0000)
+H9HCNNNBKMMLXR-NEE             0 (0000)
+MT53E1G32D2NP-046 WT:A         1 (0001)
+K4UBE3D4AA-MGCR                2 (0010)
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt b/src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt
new file mode 100644
index 0000000000..f05a5af118
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/magolor/memory/mem_list_variant.txt
@@ -0,0 +1,5 @@
+MT53E512M32D2NP-046 WT:E
+K4U6E3S4AA-MGCR
+H9HCNNNBKMMLXR-NEE
+MT53E1G32D2NP-046 WT:A
+K4UBE3D4AA-MGCR
-- 
cgit v1.2.3