summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorEdward O'Callaghan <eocallaghan@alterapraxis.com>2014-10-28 10:03:47 +1100
committerEdward O'Callaghan <eocallaghan@alterapraxis.com>2014-10-28 23:01:21 +0100
commit77896c187cc4f57960418b4e48d4faf3c84b36f0 (patch)
treee8410d7ee68d38a1ef943979e0369d3015d3959b /src/mainboard
parentc9714bc759fb5fe8e64bed303bbdb7affbb64c4e (diff)
mainboard/google/stout: Fix usage of GNU field designator ext
Following the reasoning in, 8089f17 mainboard/lenovo/x230 Fix usage of GNU field designator extension In C99 we defined a syntax for this. GCC's old syntax was deprecated. Change-Id: Id5c5d68048169b0cd400926cead2d1835194d1a5 Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-on: http://review.coreboot.org/7210 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/stout/romstage.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index bfa4af703e..728d74d842 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -161,32 +161,32 @@ void main(unsigned long bist)
int cbmem_was_initted;
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: { 0xA0, 0x00,0xA4,0x00 },
- ts_addresses: { 0x00, 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,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: {
+ .dimm_channel0_disabled = 2,
+ .dimm_channel1_disabled = 2,
+ .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) */
@@ -203,11 +203,11 @@ void main(unsigned long bist)
{ 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,
+ .usb3 = {
+ .mode = XHCI_MODE,
+ .hs_port_switch_mask = XHCI_PORTS,
+ .preboot_support = XHCI_PREBOOT,
+ .xhci_streams = XHCI_STREAMS,
},
};