diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-07-03 14:14:30 +0200 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-07-12 09:54:50 +0000 |
| commit | 6eea191511ad63017eafa22d5363a39ac99ab1db (patch) | |
| tree | eadc730127331a8bf9454696146d18f7dc042d61 /src/mainboard | |
| parent | 517bc99db1ece3f3904534e9f0d5d3b28eb4815b (diff) | |
haswell: Make `copy_spd` a weak function
Instead of using function pointers, we can use weak functions. So, drop
the pointer from `romstage_params`, leaving `pei_data` as the only
remaining member. This will be cleaned up in a follow-up commit.
Change-Id: I3b17d21ea7a650734119a5cab4892fcb158b589d
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43105
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard')
5 files changed, 4 insertions, 13 deletions
diff --git a/src/mainboard/google/slippy/variants/falco/romstage.c b/src/mainboard/google/slippy/variants/falco/romstage.c index 96fbbab8b6..901c70e5ae 100644 --- a/src/mainboard/google/slippy/variants/falco/romstage.c +++ b/src/mainboard/google/slippy/variants/falco/romstage.c @@ -13,7 +13,7 @@ #include "../../variant.h" /* Copy SPD data for on-board memory */ -static void copy_spd(struct pei_data *peid) +void copy_spd(struct pei_data *peid) { const int gpio_vector[] = {13, 9, 47, -1}; int spd_index = get_gpios(gpio_vector); @@ -84,6 +84,4 @@ void variant_romstage_entry(struct romstage_params *rp) memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); - - rp->copy_spd = copy_spd; } diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c index 35c5ef50c7..78c46dc3cc 100644 --- a/src/mainboard/google/slippy/variants/leon/romstage.c +++ b/src/mainboard/google/slippy/variants/leon/romstage.c @@ -12,7 +12,7 @@ #include "../../variant.h" /* Copy SPD data for on-board memory */ -static void copy_spd(struct pei_data *peid) +void copy_spd(struct pei_data *peid) { const int gpio_vector[] = {13, 9, 47, -1}; int spd_index = get_gpios(gpio_vector); @@ -78,6 +78,4 @@ void variant_romstage_entry(struct romstage_params *rp) memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); - - rp->copy_spd = copy_spd; } diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c index b7daf89527..c962fe0f9c 100644 --- a/src/mainboard/google/slippy/variants/peppy/romstage.c +++ b/src/mainboard/google/slippy/variants/peppy/romstage.c @@ -14,7 +14,7 @@ #include "../../variant.h" /* Copy SPD data for on-board memory */ -static void copy_spd(struct pei_data *peid) +void copy_spd(struct pei_data *peid) { const int gpio_vector[] = {13, 9, 47, -1}; int spd_index = get_gpios(gpio_vector); @@ -95,6 +95,4 @@ void variant_romstage_entry(struct romstage_params *rp) memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); - - rp->copy_spd = copy_spd; } diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c index b35160f628..c3c01a3838 100644 --- a/src/mainboard/google/slippy/variants/wolf/romstage.c +++ b/src/mainboard/google/slippy/variants/wolf/romstage.c @@ -13,7 +13,7 @@ #include "../../variant.h" /* Copy SPD data for on-board memory */ -static void copy_spd(struct pei_data *peid) +void copy_spd(struct pei_data *peid) { const int gpio_vector[] = {13, 9, 47, -1}; int spd_index = get_gpios(gpio_vector); @@ -82,6 +82,4 @@ void variant_romstage_entry(struct romstage_params *rp) memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports)); memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports)); - - rp->copy_spd = copy_spd; } diff --git a/src/mainboard/intel/baskingridge/romstage.c b/src/mainboard/intel/baskingridge/romstage.c index abbd8521cb..3a8a03bfa6 100644 --- a/src/mainboard/intel/baskingridge/romstage.c +++ b/src/mainboard/intel/baskingridge/romstage.c @@ -114,7 +114,6 @@ void mainboard_romstage_entry(void) struct romstage_params romstage_params = { .pei_data = &pei_data, - .copy_spd = NULL, }; /* Call into the real romstage main with this board's attributes. */ |