nb/intel/haswell: Drop unnecessary variable

The "normalized" boot mode is only used in a single place, so there's no
need to use a variable. Also, reword the associated comment, which seems
to be unnecessarily vague: the hardcoded assumptions are inside the MRC.

Change-Id: I260d10f231f5de765d2675416d7047717d391d8f
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43092
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
This commit is contained in:
Angel Pons 2020-07-03 11:46:50 +02:00
parent e816829e7a
commit 284a54775b
1 changed files with 3 additions and 6 deletions

View File

@ -15,7 +15,6 @@
void romstage_common(const struct romstage_params *params) void romstage_common(const struct romstage_params *params)
{ {
int boot_mode;
int wake_from_s3; int wake_from_s3;
enable_lapic(); enable_lapic();
@ -37,16 +36,14 @@ void romstage_common(const struct romstage_params *params)
#endif #endif
} }
/* There are hard coded assumptions of 2 meaning s3 wake. Normalize
* the users of the 2 literal here based off wake_from_s3. */
boot_mode = wake_from_s3 ? 2 : 0;
/* Prepare USB controller early in S3 resume */ /* Prepare USB controller early in S3 resume */
if (wake_from_s3) if (wake_from_s3)
enable_usb_bar(); enable_usb_bar();
post_code(0x3a); post_code(0x3a);
params->pei_data->boot_mode = boot_mode;
/* MRC has hardcoded assumptions of 2 meaning S3 wake. Normalize it here. */
params->pei_data->boot_mode = wake_from_s3 ? 2 : 0;
timestamp_add_now(TS_BEFORE_INITRAM); timestamp_add_now(TS_BEFORE_INITRAM);