diff options
author | Angel Pons <th3fanbus@gmail.com> | 2021-03-12 14:20:05 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-25 07:51:38 +0000 |
commit | d0f971fe9a5d3c081d932a767b7373acc5f00b4a (patch) | |
tree | b3be92cdcc2b9162b820c8b1b4876be838082c60 /src/mainboard/asrock | |
parent | 6902263dca82c9e08d48554cc1daffc8dfd6b6de (diff) | |
download | coreboot-d0f971fe9a5d3c081d932a767b7373acc5f00b4a.tar.gz coreboot-d0f971fe9a5d3c081d932a767b7373acc5f00b4a.tar.bz2 coreboot-d0f971fe9a5d3c081d932a767b7373acc5f00b4a.zip |
nb/intel/haswell: Decouple mainboard USB config from MRC
With this change, only raminit.c uses pei_data.h definitions. With MRC
cornered, making it optional is just a matter of writing a replacement.
USB config definitions will be moved to Lynx Point code in a follow-up.
Tested on Asrock B85M Pro4, still boots and still resumes from S3.
Change-Id: I4bc405213e9b0828d9ced18677335533c7dd381d
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51440
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard/asrock')
-rw-r--r-- | src/mainboard/asrock/b85m_pro4/romstage.c | 4 | ||||
-rw-r--r-- | src/mainboard/asrock/h81m-hds/romstage.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/asrock/b85m_pro4/romstage.c b/src/mainboard/asrock/b85m_pro4/romstage.c index 793a7d7b3095..75efb9e69c25 100644 --- a/src/mainboard/asrock/b85m_pro4/romstage.c +++ b/src/mainboard/asrock/b85m_pro4/romstage.c @@ -25,7 +25,7 @@ void mb_get_spd_map(struct spd_info *spdi) spdi->addresses[3] = 0x53; } -const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = { +const struct usb2_port_config mainboard_usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ { 0x0040, 1, 0, USB_PORT_BACK_PANEL }, { 0x0040, 1, 0, USB_PORT_BACK_PANEL }, @@ -43,7 +43,7 @@ const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = { { 0x0040, 1, 6, USB_PORT_BACK_PANEL }, }; -const struct usb3_port_setting mainboard_usb3_ports[MAX_USB3_PORTS] = { +const struct usb3_port_config mainboard_usb3_ports[MAX_USB3_PORTS] = { { 1, 0 }, { 1, 0 }, { 1, 1 }, diff --git a/src/mainboard/asrock/h81m-hds/romstage.c b/src/mainboard/asrock/h81m-hds/romstage.c index faac6809e304..cc9a04fad615 100644 --- a/src/mainboard/asrock/h81m-hds/romstage.c +++ b/src/mainboard/asrock/h81m-hds/romstage.c @@ -23,7 +23,7 @@ void mb_get_spd_map(struct spd_info *spdi) spdi->addresses[2] = 0x52; } -const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = { +const struct usb2_port_config mainboard_usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ { 0x0040, 1, 0, USB_PORT_BACK_PANEL }, { 0x0040, 1, 0, USB_PORT_BACK_PANEL }, @@ -41,7 +41,7 @@ const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = { { 0x0000, 0, USB_OC_PIN_SKIP, USB_PORT_SKIP }, }; -const struct usb3_port_setting mainboard_usb3_ports[MAX_USB3_PORTS] = { +const struct usb3_port_config mainboard_usb3_ports[MAX_USB3_PORTS] = { /* Enable, OCn# */ { 1, 0 }, { 1, 0 }, |