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/northbridge/intel/haswell/haswell.h | 5 +---- src/northbridge/intel/haswell/romstage.c | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/northbridge') diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h index 24d773f368..6eb8de5ea1 100644 --- a/src/northbridge/intel/haswell/haswell.h +++ b/src/northbridge/intel/haswell/haswell.h @@ -190,10 +190,7 @@ void intel_northbridge_haswell_finalize_smm(void); struct pei_data; -struct romstage_params { - struct pei_data *pei_data; -}; -void romstage_common(const struct romstage_params *params); +void romstage_common(struct pei_data *pei_data); void mb_late_romstage_setup(void); /* optional */ void haswell_early_initialization(void); diff --git a/src/northbridge/intel/haswell/romstage.c b/src/northbridge/intel/haswell/romstage.c index 00f5f47938..46633d1817 100644 --- a/src/northbridge/intel/haswell/romstage.c +++ b/src/northbridge/intel/haswell/romstage.c @@ -22,7 +22,7 @@ void __weak mb_late_romstage_setup(void) { } -void romstage_common(const struct romstage_params *params) +void romstage_common(struct pei_data *pei_data) { int wake_from_s3; @@ -52,15 +52,15 @@ void romstage_common(const struct romstage_params *params) post_code(0x3a); /* MRC has hardcoded assumptions of 2 meaning S3 wake. Normalize it here. */ - params->pei_data->boot_mode = wake_from_s3 ? 2 : 0; + pei_data->boot_mode = wake_from_s3 ? 2 : 0; timestamp_add_now(TS_BEFORE_INITRAM); report_platform_info(); - copy_spd(params->pei_data); + copy_spd(pei_data); - sdram_initialize(params->pei_data); + sdram_initialize(pei_data); timestamp_add_now(TS_AFTER_INITRAM); @@ -71,7 +71,7 @@ void romstage_common(const struct romstage_params *params) if (!wake_from_s3) { cbmem_initialize_empty(); /* Save data returned from MRC on non-S3 resumes. */ - save_mrc_data(params->pei_data); + save_mrc_data(pei_data); } else if (cbmem_initialize()) { #if CONFIG(HAVE_ACPI_RESUME) /* Failed S3 resume, reset to come up cleanly */ @@ -81,7 +81,7 @@ void romstage_common(const struct romstage_params *params) haswell_unhide_peg(); - setup_sdram_meminfo(params->pei_data); + setup_sdram_meminfo(pei_data); romstage_handoff_init(wake_from_s3); -- cgit v1.2.3