Change in coreboot[master]: mb/lenovo/x220: Do not overwrite pei_data

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43032 )

Change subject: mb/lenovo/x220: Do not overwrite pei_data
......................................................................

mb/lenovo/x220: Do not overwrite pei_data

Most of the values are already set in northbridge code.

Change-Id: Iab4d255f09095fd6fa92c0468a266ff01790fe7c
Signed-off-by: Angel Pons 
---
M src/mainboard/lenovo/x220/early_init.c
1 file changed, 20 insertions(+), 44 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/43032/1

diff --git a/src/mainboard/lenovo/x220/early_init.c b/src/mainboard/lenovo/x220/early_init.c
index 5f0ad45..17c910b 100644
--- a/src/mainboard/lenovo/x220/early_init.c
+++ b/src/mainboard/lenovo/x220/early_init.c
@@ -11,51 +11,27 @@

void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
-	struct pei_data pei_data_template = {
-		.pei_version = PEI_VERSION,
-		.mchbar = (uintptr_t)DEFAULT_MCHBAR,
-		.dmibar = (uintptr_t)DEFAULT_DMIBAR,
-		.epbar = DEFAULT_EPBAR,
-		.pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
-		.smbusbar = SMBUS_IO_BASE,
-		.wdbbar = 0x4000000,
-		.wdbsize = 0x1000,
-		.hpet_address = CONFIG_HPET_ADDRESS,
-		.rcba = (uintptr_t)DEFAULT_RCBABASE,
-		.pmbase = DEFAULT_PMBASE,
-		.gpiobase = DEFAULT_GPIOBASE,
-		.thermalbase = 0xfed08000,
-		.system_type = 0, // 0 Mobile, 1 Desktop/Server
-		.tseg_size = CONFIG_SMM_TSEG_SIZE,
-		.spd_addresses = { 0xa0, 0x00,0xa2,0x00 },
-		.ts_addresses = { 0x00, 0x00, 0x00, 0x00 },
-		.ec_present = 1,
-		.gbe_enable = 1,
-		// 0 = leave channel enabled
-		// 1 = disable dimm 0 on channel
-		// 2 = disable dimm 1 on channel
-		// 3 = disable dimm 0+1 on channel
-		.dimm_channel0_disabled = 2,
-		.dimm_channel1_disabled = 2,
-		.max_ddr3_freq = 1333,
-		.usb_port_config = {
-			{ 1, 0, 0x0040 },
-			{ 1, 1, 0x0080 },
-			{ 1, 3, 0x0080 },
-			{ 1, 3, 0x0080 },
-			{ 1, 0, 0x0080 },
-			{ 1, 0, 0x0080 },
-			{ 1, 2, 0x0040 },
-			{ 1, 2, 0x0040 },
-			{ 1, 6, 0x0080 },
-			{ 1, 5, 0x0080 },
-			{ 1, 6, 0x0080 },
-			{ 1, 6, 0x0080 },
-			{ 1, 7, 0x0080 },
-			{ 1, 6, 0x0080 },
-		},
+	pei_data->system_type   = 0; /* 0 Mobile, 1 Desktop/Server */
+	pei_data->ec_present    = 1;
+	pei_data->spd_addresses = { 0xa0, 0x00, 0xa2, 0x00 };
+	pei_data->max_ddr3_freq = 1333;
+
+	pei_data->usb_port_config = {
+		{ 1, 0, 0x0040 },
+		{ 1, 1, 0x0080 },
+		{ 1, 3, 0x0080 },
+		{ 1, 3, 0x0080 },
+		{ 1, 0, 0x0080 },
+		{ 1, 0, 0x0080 },
+		{ 1, 2, 0x0040 },
+		{ 1, 2, 0x0040 },
+		{ 1, 6, 0x0080 },
+		{ 1, 5, 0x0080 },
+		{ 1, 6, 0x0080 },
+		{ 1, 6, 0x0080 },
+		{ 1, 7, 0x0080 },
+		{ 1, 6, 0x0080 },
    };
-	*pei_data = pei_data_template;
 }

void mainboard_get_spd(spd_raw_data *spd, bool id_only)

[Angel Pons (Code Review)]

Angel Pons has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/43032 )

Change subject: mb/lenovo/x220: Do not overwrite pei_data
......................................................................

Abandoned