haswell: Drop struct romstage_params
type
It only contains a pointer to another struct. Flatten it. Change-Id: Iab427592c332646e032a768719fc380c5794086b Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43106 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
This commit is contained in:
@@ -70,9 +70,5 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
@@ -70,9 +70,5 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
@@ -100,10 +100,6 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
/* Call into the real romstage main with this board's attributes. */
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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));
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
|
@@ -112,10 +112,6 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
/* Call into the real romstage main with this board's attributes. */
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
@@ -92,9 +92,5 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
@@ -68,9 +68,5 @@ void mainboard_romstage_entry(void)
|
||||
},
|
||||
};
|
||||
|
||||
struct romstage_params romstage_params = {
|
||||
.pei_data = &pei_data,
|
||||
};
|
||||
|
||||
romstage_common(&romstage_params);
|
||||
romstage_common(&pei_data);
|
||||
}
|
||||
|
Reference in New Issue
Block a user