Revert "mb/google/volteer/variant/lindar: Update memory settings."

This reverts commit 2ad859988b5243411393fdf3116eea281b92b1bb.

Reason for revert: broke the build

Change-Id: I7e7d917c2e8b698d5c7c3ce0b6d34e80696185f3
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44993
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

5 files changed, 1 insertions, 75 deletions

diff --git a/src/mainboard/google/volteer/variants/lindar/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/Makefile.inc
index b0bfc567ff..776c4eaaf9 100644
--- a/src/mainboard/google/volteer/variants/lindar/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/lindar/Makefile.inc
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-bootblock-y += gpio.c
 
-romstage-y += memory.c
+bootblock-y += gpio.c
 
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/volteer/variants/lindar/memory.c b/src/mainboard/google/volteer/variants/lindar/memory.c
deleted file mode 100644
index 11bcf4ca89..0000000000
--- a/src/mainboard/google/volteer/variants/lindar/memory.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <baseboard/variants.h>
-
-static const struct lpddr4x_cfg lindar_memcfg = {
-	/* DQ byte map */
-	.dq_map = {
-		[0] = {
-			{ 3,  1,  0,  2,  4,  6,  7,  5, }, /* DDR0_DQ0[7:0] */
-			{ 12, 13, 14, 15,  8,  9, 10, 11 }, /* DDR0_DQ1[7:0] */
-		},
-		[1] = {
-			{ 0,  7,  1,  6,  2,  4,  3,  5, }, /* DDR1_DQ0[7:0] */
-			{ 8,  15, 14,  9, 13, 10, 12, 11 }, /* DDR1_DQ1[7:0] */
-		},
-		[2] = {
-			{ 3,  2,  0,  1,  4,  5,  6,  7, }, /* DDR2_DQ0[7:0] */
-			{ 12, 13, 15, 14,  8,  9, 10, 11 }, /* DDR2_DQ1[7:0] */
-		},
-		[3] = {
-			{ 6,  0,  1,  7,  5,  4,  2,  3, }, /* DDR3_DQ0[7:0] */
-			{ 15, 14,  8,  9, 10, 12, 11, 13 }, /* DDR3_DQ1[7:0] */
-		},
-		[4] = {
-			{ 5,  0,  1,  3,  4,  2,  7,  6, }, /* DDR4_DQ0[7:0] */
-			{ 11, 14, 13, 12,  8,  9, 15, 10 }, /* DDR4_DQ1[7:0] */
-		},
-		[5] = {
-			{  3,  4,  2,  5,  0,  6,  1,  7, }, /* DDR5_DQ0[7:0] */
-			{  13, 12, 11, 10, 14, 15,  9,  8 }, /* DDR5_DQ1[7:0] */
-		},
-		[6] = {
-			{  3,  2,  1,  0,  5,  4,  7,  6, }, /* DDR6_DQ0[7:0] */
-			{  12, 13, 15, 14,  8, 11,  9, 10 }, /* DDR6_DQ1[7:0] */
-		},
-		[7] = {
-			{  3,  4,  2,  5,  1,  0,  7,  6, }, /* DDR7_DQ0[7:0] */
-			{  15, 14,  9,  8, 12, 10, 11, 13 }, /* DDR7_DQ1[7:0] */
-		},
-	},
-
-	/* DQS CPU<>DRAM map */
-	.dqs_map = {
-		[0] = { 0, 1 },  /* DDR0_DQS[1:0] */
-		[1] = { 0, 1 },  /* DDR1_DQS[1:0] */
-		[2] = { 0, 1 },  /* DDR2_DQS[1:0] */
-		[3] = { 0, 1 },  /* DDR3_DQS[1:0] */
-		[4] = { 0, 1 },  /* DDR4_DQS[1:0] */
-		[5] = { 0, 1 },  /* DDR5_DQS[1:0] */
-		[6] = { 0, 1 },  /* DDR6_DQS[1:0] */
-		[7] = { 0, 1 },  /* DDR7_DQS[1:0] */
-	},
-
-	.ect = 1, /* Enable Early Command Training */
-};
-
-static const struct ddr_memory_cfg board_memcfg = {
-	.mem_type = MEMTYPE_LPDDR4X,
-	.lpddr4_cfg = &lindar_memcfg
-};
-
-const struct ddr_memory_cfg *variant_memory_params(void)
-{
-	return &board_memcfg;
-}
diff --git a/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc
deleted file mode 100644
index 4c95819cb9..0000000000
--- a/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc
+++ /dev/null
@@ -1,5 +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 = K4U6E3S4AA-MGCL
diff --git a/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt
deleted file mode 100644
index 9bf0bd9af0..0000000000
--- a/src/mainboard/google/volteer/variants/lindar/memory/dram_id.generated.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DRAM Part Name                 ID to assign
-K4U6E3S4AA-MGCL                0 (0000)
diff --git a/src/mainboard/google/volteer/variants/lindar/memory/mem_list_variant.txt b/src/mainboard/google/volteer/variants/lindar/memory/mem_list_variant.txt
deleted file mode 100644
index a226d2f741..0000000000
--- a/src/mainboard/google/volteer/variants/lindar/memory/mem_list_variant.txt
+++ /dev/null
@@ -1 +0,0 @@
-K4U6E3S4AA-MGCL