summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-05-23 15:57:46 -0500
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-11-25 23:37:57 +0100
commitb1c25e74af0a7b1cb4aae0fc9ab8147ee9d14907 (patch)
treedc46deac7f5c9c16e64ac7c569eaf854a7dd4b8a /src/mainboard/intel
parent5290f71569d1bf8b6fa80d34f4b176407082fec8 (diff)
downloadcoreboot-b1c25e74af0a7b1cb4aae0fc9ab8147ee9d14907.tar.xz
haswell: update pei_data data structure
Update and use the new pei_data data structure. Now that the reference code is fixed it's possible to properly disable/enable the USB2 and USB3 ports correctly. Change-Id: I075c646e7574be354420b6e59507e8917a97d0f0 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/56594 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/4185 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/baskingridge/romstage.c40
-rw-r--r--src/mainboard/intel/wtm2/romstage.c32
2 files changed, 42 insertions, 30 deletions
diff --git a/src/mainboard/intel/baskingridge/romstage.c b/src/mainboard/intel/baskingridge/romstage.c
index 36592541a0..8b18e6d534 100644
--- a/src/mainboard/intel/baskingridge/romstage.c
+++ b/src/mainboard/intel/baskingridge/romstage.c
@@ -93,21 +93,31 @@ void mainboard_romstage_entry(unsigned long bist)
dimm_channel0_disabled: 0,
dimm_channel1_disabled: 0,
max_ddr3_freq: 1600,
- usb_port_config: {
- { 1, 0, 0x0040 }, /* P0: Back USB3 port (OC0) */
- { 1, 0, 0x0040 }, /* P1: Back USB3 port (OC0) */
- { 1, 1, 0x0040 }, /* P2: Flex Port on bottom (OC1) */
- { 1, 8, 0x0040 }, /* P3: Docking connector (no OC) */
- { 1, 8, 0x0040 }, /* P4: Mini PCIE (no OC) */
- { 1, 1, 0x0040 }, /* P5: USB eSATA header (OC1) */
- { 1, 3, 0x0040 }, /* P6: Front Header J8H2 (OC3) */
- { 1, 3, 0x0040 }, /* P7: Front Header J8H2 (OC3) */
- { 1, 4, 0x0040 }, /* P8: USB/LAN Jack (OC4) */
- { 1, 4, 0x0040 }, /* P9: USB/LAN Jack (OC4) */
- { 1, 5, 0x0040 }, /* P10: Front Header J7H3 (OC5) */
- { 1, 5, 0x0040 }, /* P11: Front Header J7H3 (OC5) */
- { 1, 6, 0x0040 }, /* P12: USB/DP Jack (OC6) */
- { 1, 6, 0x0040 }, /* P13: USB/DP Jack (OC6) */
+ usb2_ports: {
+ /* Length, Enable, OCn# */
+ { 0x0040, 1, 0 }, /* P0: Back USB3 port (OC0) */
+ { 0x0040, 1, 0 }, /* P1: Back USB3 port (OC0) */
+ { 0x0040, 1, 1 }, /* P2: Flex Port on bottom (OC1) */
+ { 0x0040, 1, USB_OC_PIN_SKIP }, /* P3: Dock connector */
+ { 0x0040, 1, USB_OC_PIN_SKIP }, /* P4: Mini PCIE */
+ { 0x0040, 1, 1 }, /* P5: USB eSATA header (OC1) */
+ { 0x0040, 1, 3 }, /* P6: Front Header J8H2 (OC3) */
+ { 0x0040, 1, 3 }, /* P7: Front Header J8H2 (OC3) */
+ { 0x0040, 1, 4 }, /* P8: USB/LAN Jack (OC4) */
+ { 0x0040, 1, 4 }, /* P9: USB/LAN Jack (OC4) */
+ { 0x0040, 1, 5 }, /* P10: Front Header J7H3 (OC5) */
+ { 0x0040, 1, 5 }, /* P11: Front Header J7H3 (OC5) */
+ { 0x0040, 1, 6 }, /* P12: USB/DP Jack (OC6) */
+ { 0x0040, 1, 6 }, /* P13: USB/DP Jack (OC6) */
+ },
+ usb3_ports: {
+ /* Enable, OCn# */
+ { 1, 0 }, /* P1; */
+ { 1, 0 }, /* P2; */
+ { 1, 0 }, /* P3; */
+ { 1, 0 }, /* P4; */
+ { 1, 0 }, /* P6; */
+ { 1, 0 }, /* P6; */
},
};
diff --git a/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c
index 440b35f4fe..f38389c543 100644
--- a/src/mainboard/intel/wtm2/romstage.c
+++ b/src/mainboard/intel/wtm2/romstage.c
@@ -98,21 +98,23 @@ void mainboard_romstage_entry(unsigned long bist)
dimm_channel0_disabled: 2,
dimm_channel1_disabled: 2,
max_ddr3_freq: 1600,
- usb_port_config: {
- { 1, 0, 0x0040 }, /* P0: */
- { 1, 0, 0x0040 }, /* P1: */
- { 1, 0, 0x0040 }, /* P2: */
- { 1, 0, 0x0040 }, /* P3: */
- { 1, 0, 0x0040 }, /* P4: */
- { 1, 0, 0x0040 }, /* P5: */
- { 1, 0, 0x0040 }, /* P6: */
- { 0, 0, 0x0040 }, /* P7: Disable SDCARD due to hang */
- { 1, 0, 0x0040 }, /* P8: */
- { 1, 0, 0x0040 }, /* P9: */
- { 1, 0, 0x0040 }, /* P10: */
- { 1, 0, 0x0000 }, /* P11: */
- { 1, 0, 0x0040 }, /* P12: */
- { 1, 0, 0x0040 }, /* P13: */
+ usb2_ports: {
+ /* Length, Enable, OCn# */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P0: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P1: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P2: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P3: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P4: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P5: */
+ { 0x40, 1, USB_OC_PIN_SKIP }, /* P6: */
+ { 0x40, 0, USB_OC_PIN_SKIP }, /* P7: Disable SDCARD due to hang */
+ },
+ usb3_ports: {
+ /* Enable, OCn# */
+ { 1, USB_OC_PIN_SKIP }, /* P1; */
+ { 1, USB_OC_PIN_SKIP }, /* P2; */
+ { 1, USB_OC_PIN_SKIP }, /* P3; */
+ { 1, USB_OC_PIN_SKIP }, /* P4; */
},
};