1 files changed, 5 insertions, 45 deletions
diff --git a/src/mainboard/google/stout/early_init.c b/src/mainboard/google/stout/early_init.c
index e5ed8e91ac..85c4e154dd 100644
--- a/src/mainboard/google/stout/early_init.c
+++ b/src/mainboard/google/stout/early_init.c
@@ -89,51 +89,11 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
 
 void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
-	struct pei_data pei_data_template = {
-		.pei_version = PEI_VERSION,
-		.mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
-		.dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
-		.epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
-		.pciexbar = CONFIG_ECAM_MMCONF_BASE_ADDRESS,
-		.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
-		.wdbbar = 0x4000000,
-		.wdbsize = 0x1000,
-		.hpet_address = HPET_BASE_ADDRESS,
-		.rcba = (uintptr_t)DEFAULT_RCBA,
-		.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,
-		.max_ddr3_freq = 1600,
-		.usb_port_config = {
-			/* enabled   USB oc pin    length */
-			{ 1, 0, 0x0040 }, /* P0: USB 3.0 1  (OC0) */
-			{ 1, 0, 0x0040 }, /* P1: USB 3.0 2  (OC0) */
-			{ 0, 1, 0x0000 }, /* P2: Empty */
-			{ 1, 1, 0x0040 }, /* P3: Camera (no OC) */
-			{ 1, 1, 0x0040 }, /* P4: WLAN   (no OC) */
-			{ 1, 1, 0x0040 }, /* P5: WWAN   (no OC) */
-			{ 0, 1, 0x0000 }, /* P6: Empty */
-			{ 0, 1, 0x0000 }, /* P7: Empty */
-			{ 0, 5, 0x0000 }, /* P8: Empty */
-			{ 1, 4, 0x0040 }, /* P9: USB 2.0 (AUO4) (OC4) */
-			{ 0, 5, 0x0000 }, /* P10: Empty */
-			{ 0, 5, 0x0000 }, /* P11: Empty */
-			{ 0, 5, 0x0000 }, /* P12: Empty */
-			{ 1, 5, 0x0040 }, /* P13: Bluetooth (no OC) */
-		},
-		.usb3 = {
-			.mode = XHCI_MODE,
-			.hs_port_switch_mask = XHCI_PORTS,
-			.preboot_support = XHCI_PREBOOT,
-			.xhci_streams = XHCI_STREAMS,
-		},
-	};
-	*pei_data = pei_data_template;
+	const uint8_t spdaddr[] = {0xA0, 0x00, 0xA4, 0x00};
+
+	memcpy(pei_data->spd_addresses, &spdaddr, sizeof(pei_data->spd_addresses));
+
+	/* TODO: Confirm if nortbridge_fill_pei_data() gets .system_type right (should be 0) */
 }
 
 void mainboard_early_init(int s3resume)