vboot: remove extraneous vboot_recovery_mode_memory_retrain

Just call get_recovery_mode_retrain_switch() directly.

BUG=b:124141368
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: Icb88d6862db1782e0218276984e527638b21fd3a
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39343
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Joel Kitching
2020-03-06 13:44:50 +08:00
committed by Patrick Georgi
parent 18129f919a
commit 9a2922871d
5 changed files with 5 additions and 10 deletions

View File

@@ -14,6 +14,7 @@
*/
#include <assert.h>
#include <bootmode.h>
#include <cbfs.h>
#include <console/console.h>
#include <ip_checksum.h>
@@ -174,7 +175,7 @@ static void mt_mem_init_run(struct dramc_param_ops *dparam_ops)
/* Load calibration params from flash and run fast calibration */
if (recovery_mode) {
printk(BIOS_WARNING, "Skip loading cached calibration data\n");
if (vboot_recovery_mode_memory_retrain() ||
if (get_recovery_mode_retrain_switch() ||
vboot_check_recovery_request() == VB2_RECOVERY_TRAIN_AND_REBOOT) {
printk(BIOS_WARNING, "Retrain memory in next boot\n");
/* Use 0xFF as erased flash data. */