diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2021-01-20 22:29:40 +0100 |
|---|---|---|
| committer | Michael Niewöhner <foss@mniewoehner.de> | 2021-01-23 13:35:47 +0000 |
| commit | 3ece16410f12a03e82251ddd19d13ed4706be5c5 (patch) | |
| tree | 050ad9c8fccba5f0e2d909ee017633170c663fb3 | |
| parent | 292a7641418bbd653f8097419578793a9c758623 (diff) | |
mb/google/auron: Drop `variant_romstage_entry`
Replace it with `mainboard_post_raminit`.
Change-Id: I94636c775cee6c14317ecff36972e2d267d28c91
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
| -rw-r--r-- | src/mainboard/google/auron/romstage.c | 8 | ||||
| -rw-r--r-- | src/mainboard/google/auron/variant.h | 1 | ||||
| -rw-r--r-- | src/mainboard/google/auron/variants/gandof/variant.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/auron/variants/lulu/variant.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/auron/variants/samus/variant.c | 2 |
5 files changed, 4 insertions, 11 deletions
diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c index a10314e4b4..9de58a86d2 100644 --- a/src/mainboard/google/auron/romstage.c +++ b/src/mainboard/google/auron/romstage.c @@ -7,10 +7,6 @@ #include <soc/romstage.h> #include "variant.h" -__weak void variant_romstage_entry(struct romstage_params *rp) -{ -} - void mainboard_pre_raminit(struct romstage_params *rp) { /* Fill out PEI DATA */ @@ -19,8 +15,6 @@ void mainboard_pre_raminit(struct romstage_params *rp) } -void mainboard_post_raminit(struct romstage_params *rp) +__weak void mainboard_post_raminit(struct romstage_params *rp) { - /* Do variant-specific init */ - variant_romstage_entry(rp); } diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h index 87986a9f1e..380a373f2d 100644 --- a/src/mainboard/google/auron/variant.h +++ b/src/mainboard/google/auron/variant.h @@ -9,7 +9,6 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current); -void variant_romstage_entry(struct romstage_params *rp); void lan_init(void); void mainboard_fill_spd_data(struct pei_data *pei_data); diff --git a/src/mainboard/google/auron/variants/gandof/variant.c b/src/mainboard/google/auron/variants/gandof/variant.c index acf2a2d2cd..0d2f47ecf5 100644 --- a/src/mainboard/google/auron/variants/gandof/variant.c +++ b/src/mainboard/google/auron/variants/gandof/variant.c @@ -24,7 +24,7 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return len; } -void variant_romstage_entry(struct romstage_params *rp) +void mainboard_post_raminit(struct romstage_params *rp) { if (rp->power_state->prev_sleep_state != ACPI_S3) google_chromeec_kbbacklight(75); diff --git a/src/mainboard/google/auron/variants/lulu/variant.c b/src/mainboard/google/auron/variants/lulu/variant.c index e8b31745f9..b38807bfcd 100644 --- a/src/mainboard/google/auron/variants/lulu/variant.c +++ b/src/mainboard/google/auron/variants/lulu/variant.c @@ -34,7 +34,7 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return len; } -void variant_romstage_entry(struct romstage_params *rp) +void mainboard_post_raminit(struct romstage_params *rp) { if (rp->power_state->prev_sleep_state != ACPI_S3) google_chromeec_kbbacklight(75); diff --git a/src/mainboard/google/auron/variants/samus/variant.c b/src/mainboard/google/auron/variants/samus/variant.c index 12f4e86272..c69e66298c 100644 --- a/src/mainboard/google/auron/variants/samus/variant.c +++ b/src/mainboard/google/auron/variants/samus/variant.c @@ -21,7 +21,7 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return 0; } -void variant_romstage_entry(struct romstage_params *rp) +void mainboard_post_raminit(struct romstage_params *rp) { if (rp->power_state->prev_sleep_state != ACPI_S3) google_chromeec_kbbacklight(100); |