Change in coreboot[master]: mb/google/parrot: Do not overwrite pei_data

[Angel Pons (Code Review)]

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

Change subject: mb/google/parrot: Do not overwrite pei_data
......................................................................

mb/google/parrot: Do not overwrite pei_data

Most of the values are already set in northbridge code.

Change-Id: Ibad49251b88107d5fed6283d8e2ddd90927358d8
Signed-off-by: Angel Pons 
---
M src/mainboard/google/parrot/early_init.c
1 file changed, 22 insertions(+), 45 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/43027/1

diff --git a/src/mainboard/google/parrot/early_init.c b/src/mainboard/google/parrot/early_init.c
index 3c5c363..1552550 100644
--- a/src/mainboard/google/parrot/early_init.c
+++ b/src/mainboard/google/parrot/early_init.c
@@ -52,52 +52,29 @@

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,0xA4,0x00 },
-		.ts_addresses = { 0x00, 0x00, 0x00, 0x00 },
-		.ec_present = 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 = 1600,
-		.usb_port_config = {
-			/* Empty and onboard Ports 0-7, set to un-used pin OC3 */
-			{ 0, 3, 0x0000 }, /* P0: Empty */
-			{ 1, 0, 0x0040 }, /* P1: Left USB 1  (OC0) */
-			{ 1, 1, 0x0040 }, /* P2: Left USB 2  (OC1) */
-			{ 1, 1, 0x0040 }, /* P3: Left USB 3  (OC1) */
-			{ 0, 3, 0x0000 }, /* P4: Empty */
-			{ 0, 3, 0x0000 }, /* P5: Empty */
-			{ 0, 3, 0x0000 }, /* P6: Empty */
-			{ 0, 3, 0x0000 }, /* P7: Empty */
-			/* Empty and onboard Ports 8-13, set to un-used pin OC4 */
-			{ 1, 4, 0x0040 }, /* P8: MiniPCIe (WLAN) (no OC) */
-			{ 0, 4, 0x0000 }, /* P9: Empty */
-			{ 1, 4, 0x0040 }, /* P10: Camera (no OC) */
-			{ 0, 4, 0x0000 }, /* P11: Empty */
-			{ 0, 4, 0x0000 }, /* P12: Empty */
-			{ 0, 4, 0x0000 }, /* P13: Empty */
-		},
+	pei_data->system_type   = 0; /* 0 Mobile, 1 Desktop/Server */
+	pei_data->ec_present    = 1;
+	pei_data->spd_addresses = { 0xA0, 0x00, 0xA4, 0x00 };
+	pei_data->max_ddr3_freq = 1600;
+
+	pei_data->usb_port_config = {
+		/* Empty and onboard Ports 0-7, set to un-used pin OC3 */
+		{ 0, 3, 0x0000 }, /* P0: Empty */
+		{ 1, 0, 0x0040 }, /* P1: Left USB 1  (OC0) */
+		{ 1, 1, 0x0040 }, /* P2: Left USB 2  (OC1) */
+		{ 1, 1, 0x0040 }, /* P3: Left USB 3  (OC1) */
+		{ 0, 3, 0x0000 }, /* P4: Empty */
+		{ 0, 3, 0x0000 }, /* P5: Empty */
+		{ 0, 3, 0x0000 }, /* P6: Empty */
+		{ 0, 3, 0x0000 }, /* P7: Empty */
+		/* Empty and onboard Ports 8-13, set to un-used pin OC4 */
+		{ 1, 4, 0x0040 }, /* P8: MiniPCIe (WLAN) (no OC) */
+		{ 0, 4, 0x0000 }, /* P9: Empty */
+		{ 1, 4, 0x0040 }, /* P10: Camera (no OC) */
+		{ 0, 4, 0x0000 }, /* P11: Empty */
+		{ 0, 4, 0x0000 }, /* P12: Empty */
+		{ 0, 4, 0x0000 }, /* P13: Empty */
    };
-	*pei_data = pei_data_template;
 }

const struct southbridge_usb_port mainboard_usb_ports[] = {

[Angel Pons (Code Review)]

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

Change subject: mb/google/parrot: Do not overwrite pei_data
......................................................................

Abandoned