From ac1c9bb5cdca24312c669eaaa908b13202e3bb35 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 20 Jan 2021 22:36:20 +0100 Subject: broadwell: Clean up `mainboard_post_raminit` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make it optional and change its signature. Change-Id: I4b5f3fb08e8954514ebf39e72c95aa62d66856d7 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/49775 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/mainboard/google/auron/romstage.c | 4 ---- src/mainboard/google/auron/variants/gandof/variant.c | 4 ++-- src/mainboard/google/auron/variants/lulu/variant.c | 4 ++-- src/mainboard/google/auron/variants/samus/variant.c | 4 ++-- src/mainboard/google/jecht/romstage.c | 2 +- src/mainboard/intel/wtm2/romstage.c | 4 ---- src/mainboard/purism/librem_bdw/romstage.c | 4 ---- 7 files changed, 7 insertions(+), 19 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c index 9de58a86d2..a3705bc1b8 100644 --- a/src/mainboard/google/auron/romstage.c +++ b/src/mainboard/google/auron/romstage.c @@ -14,7 +14,3 @@ void mainboard_pre_raminit(struct romstage_params *rp) mainboard_fill_spd_data(&rp->pei_data); } - -__weak void mainboard_post_raminit(struct romstage_params *rp) -{ -} diff --git a/src/mainboard/google/auron/variants/gandof/variant.c b/src/mainboard/google/auron/variants/gandof/variant.c index 0d2f47ecf5..b93e2c1472 100644 --- a/src/mainboard/google/auron/variants/gandof/variant.c +++ b/src/mainboard/google/auron/variants/gandof/variant.c @@ -24,8 +24,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return len; } -void mainboard_post_raminit(struct romstage_params *rp) +void mainboard_post_raminit(const int s3resume) { - if (rp->power_state->prev_sleep_state != ACPI_S3) + if (!s3resume) 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 b38807bfcd..8349acaeff 100644 --- a/src/mainboard/google/auron/variants/lulu/variant.c +++ b/src/mainboard/google/auron/variants/lulu/variant.c @@ -34,8 +34,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return len; } -void mainboard_post_raminit(struct romstage_params *rp) +void mainboard_post_raminit(const int s3resume) { - if (rp->power_state->prev_sleep_state != ACPI_S3) + if (!s3resume) 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 c69e66298c..1e4a258749 100644 --- a/src/mainboard/google/auron/variants/samus/variant.c +++ b/src/mainboard/google/auron/variants/samus/variant.c @@ -21,9 +21,9 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current) return 0; } -void mainboard_post_raminit(struct romstage_params *rp) +void mainboard_post_raminit(const int s3resume) { - if (rp->power_state->prev_sleep_state != ACPI_S3) + if (!s3resume) google_chromeec_kbbacklight(100); printk(BIOS_INFO, "MLB: board version %s\n", samus_board_version()); diff --git a/src/mainboard/google/jecht/romstage.c b/src/mainboard/google/jecht/romstage.c index 612901123e..58db3cf522 100644 --- a/src/mainboard/google/jecht/romstage.c +++ b/src/mainboard/google/jecht/romstage.c @@ -18,7 +18,7 @@ void mainboard_pre_raminit(struct romstage_params *rp) mainboard_fill_spd_data(&rp->pei_data); } -void mainboard_post_raminit(struct romstage_params *rp) +void mainboard_post_raminit(const int s3resume) { if (CONFIG(CHROMEOS)) init_bootmode_straps(); diff --git a/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c index 9e22250935..1b6539b55d 100644 --- a/src/mainboard/intel/wtm2/romstage.c +++ b/src/mainboard/intel/wtm2/romstage.c @@ -11,7 +11,3 @@ void mainboard_pre_raminit(struct romstage_params *rp) /* Fill out PEI DATA */ mainboard_fill_pei_data(&rp->pei_data); } - -void mainboard_post_raminit(struct romstage_params *rp) -{ -} diff --git a/src/mainboard/purism/librem_bdw/romstage.c b/src/mainboard/purism/librem_bdw/romstage.c index 8fc2f9eaf7..8ffd078335 100644 --- a/src/mainboard/purism/librem_bdw/romstage.c +++ b/src/mainboard/purism/librem_bdw/romstage.c @@ -9,7 +9,3 @@ void mainboard_pre_raminit(struct romstage_params *rp) /* Fill out PEI DATA */ mainboard_fill_pei_data(&rp->pei_data); } - -void mainboard_post_raminit(struct romstage_params *rp) -{ -} -- cgit v1.2.3