New patch to review for coreboot: 2059420 Fix up Stumpy/Lumpy PEI data for system agent r6

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3831

-gerrit

commit 205942033e66b1646b4d43b5c7a030f11afb8a65
Author: Stefan Reinauer 
Date:   Mon Jul 29 14:02:06 2013 -0700

Fix up Stumpy/Lumpy PEI data for system agent r6

Change-Id: I79937fd1671af23184ab830d5ba6242c8067d944
    Signed-off-by: Stefan Reinauer 
---
 src/mainboard/samsung/lumpy/romstage.c  | 45 +++++++++++++++------------------
 src/mainboard/samsung/stumpy/romstage.c |  2 +-
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index be1411e..92f24c6 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -146,33 +146,32 @@ void main(unsigned long bist)
    	.hi = pci_read_config32(PCI_DEV(0, 0x1f, 2), 0xd0)
    };
 #endif
-
    struct pei_data pei_data = {
-		.pei_version = PEI_VERSION,
-		.mchbar = DEFAULT_MCHBAR,
-		.dmibar = DEFAULT_DMIBAR,
-		.epbar = DEFAULT_EPBAR,
-		.pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
-		.smbusbar = SMBUS_IO_BASE,
-		.wdbbar = 0x4000000,
-		.wdbsize = 0x1000,
-		.hpet_address = CONFIG_HPET_ADDRESS,
-		.rcba = 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 = { 0x50, 0x00,0xf0,0x00 },
-		.ts_addresses = { 0x30, 0x00, 0x00, 0x00 },
-		.ec_present = 1,
+		pei_version: PEI_VERSION,
+		mchbar: DEFAULT_MCHBAR,
+		dmibar: DEFAULT_DMIBAR,
+		epbar: DEFAULT_EPBAR,
+		pciexbar: CONFIG_MMCONF_BASE_ADDRESS,
+		smbusbar: SMBUS_IO_BASE,
+		wdbbar: 0x4000000,
+		wdbsize: 0x1000,
+		hpet_address: CONFIG_HPET_ADDRESS,
+		rcba: 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,0x00,0x00 },
+		ts_addresses: { 0x30, 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,
-		.usb_port_config = {
+		dimm_channel0_disabled: 2,
+		dimm_channel1_disabled: 2,
+		usb_port_config: {
    		{ 1, 0, 0x0080 }, /* P0: Port 0      (OC0) */
    		{ 1, 1, 0x0080 }, /* P1: Port 1      (OC1) */
    		{ 1, 0, 0x0040 }, /* P2: MINIPCIE1   (no OC) */
@@ -188,8 +187,6 @@ void main(unsigned long bist)
    		{ 0, 4, 0x0000 }, /* P12: Empty */
    		{ 0, 4, 0x0000 }, /* P13: Empty */
    	},
-		.spd_data = {
-		}
    };

typedef const uint8_t spd_blob[256];
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index f64e860..44c171f 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -198,7 +198,7 @@ void main(unsigned long bist)
    	thermalbase: 0xfed08000,
    	system_type: 0, // 0 Mobile, 1 Desktop/Server
    	tseg_size: CONFIG_SMM_TSEG_SIZE,
-		spd_addresses: { 0x50, 0x00,0x52,0x00 },
+		spd_addresses: { 0xa0, 0x00,0xa4,0x00 },
    	ts_addresses: { 0x00, 0x00, 0x00, 0x00 },
    	ec_present: 0,
    	// 0 = leave channel enabled