From 14c4f4f43cc5a1cdcb2769357cee7e00fd620e93 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 3 Jul 2020 14:22:20 +0200 Subject: haswell: Drop `struct romstage_params` type It only contains a pointer to another struct. Flatten it. Change-Id: Iab427592c332646e032a768719fc380c5794086b Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/43106 Tested-by: build bot (Jenkins) Reviewed-by: Tristan Corrick --- src/mainboard/google/slippy/romstage.c | 8 ++------ src/mainboard/google/slippy/variant.h | 2 +- src/mainboard/google/slippy/variants/falco/romstage.c | 8 ++++---- src/mainboard/google/slippy/variants/leon/romstage.c | 6 +++--- src/mainboard/google/slippy/variants/peppy/romstage.c | 6 +++--- src/mainboard/google/slippy/variants/wolf/romstage.c | 6 +++--- 6 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/mainboard/google/slippy') diff --git a/src/mainboard/google/slippy/romstage.c b/src/mainboard/google/slippy/romstage.c index 5261ddc377..c7240491cd 100644 --- a/src/mainboard/google/slippy/romstage.c +++ b/src/mainboard/google/slippy/romstage.c @@ -73,12 +73,8 @@ void mainboard_romstage_entry(void) .usb_xhci_on_resume = 1, }; - struct romstage_params romstage_params = { - .pei_data = &pei_data, - }; - - variant_romstage_entry(&romstage_params); + variant_romstage_entry(&pei_data); /* Call into the real romstage main with this board's attributes. */ - romstage_common(&romstage_params); + romstage_common(&pei_data); } diff --git a/src/mainboard/google/slippy/variant.h b/src/mainboard/google/slippy/variant.h index 7eaac84555..2263f9d099 100644 --- a/src/mainboard/google/slippy/variant.h +++ b/src/mainboard/google/slippy/variant.h @@ -3,6 +3,6 @@ #ifndef VARIANT_H #define VARIANT_H -void variant_romstage_entry(struct romstage_params *rp); +void variant_romstage_entry(struct pei_data *pei_data); #endif diff --git a/src/mainboard/google/slippy/variants/falco/romstage.c b/src/mainboard/google/slippy/variants/falco/romstage.c index 901c70e5ae..11515cf671 100644 --- a/src/mainboard/google/slippy/variants/falco/romstage.c +++ b/src/mainboard/google/slippy/variants/falco/romstage.c @@ -50,9 +50,9 @@ void copy_spd(struct pei_data *peid) } } -void variant_romstage_entry(struct romstage_params *rp) +void variant_romstage_entry(struct pei_data *pei_data) { - rp->pei_data->ddr_refresh_2x = 1; /* Enable 2x refresh mode */ + pei_data->ddr_refresh_2x = 1; /* Enable 2x refresh mode */ struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ @@ -82,6 +82,6 @@ void variant_romstage_entry(struct romstage_params *rp) { 0, USB_OC_PIN_SKIP }, /* P4; */ }; - memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); - memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); + memcpy(pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); + memcpy(pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); } diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c index 78c46dc3cc..7a13b90ff5 100644 --- a/src/mainboard/google/slippy/variants/leon/romstage.c +++ b/src/mainboard/google/slippy/variants/leon/romstage.c @@ -46,7 +46,7 @@ void copy_spd(struct pei_data *peid) spd_file + (spd_index * spd_len), spd_len); } -void variant_romstage_entry(struct romstage_params *rp) +void variant_romstage_entry(struct pei_data *pei_data) { struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ @@ -76,6 +76,6 @@ void variant_romstage_entry(struct romstage_params *rp) { 0, USB_OC_PIN_SKIP }, /* P4; */ }; - memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); - memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); + memcpy(pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); + memcpy(pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); } diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c index c962fe0f9c..230595e205 100644 --- a/src/mainboard/google/slippy/variants/peppy/romstage.c +++ b/src/mainboard/google/slippy/variants/peppy/romstage.c @@ -63,7 +63,7 @@ void copy_spd(struct pei_data *peid) } } -void variant_romstage_entry(struct romstage_params *rp) +void variant_romstage_entry(struct pei_data *pei_data) { struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ @@ -93,6 +93,6 @@ void variant_romstage_entry(struct romstage_params *rp) { 0, USB_OC_PIN_SKIP }, /* P4; */ }; - memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); - memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); + memcpy(pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); + memcpy(pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); } diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c index c3c01a3838..4e02f734ae 100644 --- a/src/mainboard/google/slippy/variants/wolf/romstage.c +++ b/src/mainboard/google/slippy/variants/wolf/romstage.c @@ -50,7 +50,7 @@ void copy_spd(struct pei_data *peid) } } -void variant_romstage_entry(struct romstage_params *rp) +void variant_romstage_entry(struct pei_data *pei_data) { struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = { /* Length, Enable, OCn#, Location */ @@ -80,6 +80,6 @@ void variant_romstage_entry(struct romstage_params *rp) { 0, USB_OC_PIN_SKIP }, /* P4; */ }; - memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); - memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); + memcpy(pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); + memcpy(pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); } -- cgit v1.2.3