summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2020-03-06 13:44:50 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-03-12 07:39:47 +0000
commit9a2922871d365dbaa373e155c3a72bae4a9d8204 (patch)
tree1863d3d9c0a9e667ad832b14d0b4211d7f4cf057 /src/security
parent18129f919ac637e7b728ec7e4d1eb797eb3b465b (diff)
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>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/vboot/bootmode.c5
-rw-r--r--src/security/vboot/vboot_common.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 2363bf9588..6cbb1160ca 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -71,11 +71,6 @@ int __weak get_recovery_mode_retrain_switch(void)
return 0;
}
-int vboot_recovery_mode_memory_retrain(void)
-{
- return get_recovery_mode_retrain_switch();
-}
-
#if CONFIG(VBOOT_NO_BOARD_SUPPORT)
/**
* TODO: Create flash protection interface which implements get_write_protect_state.
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 57f3475adb..8be9d2ac8d 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -67,14 +67,12 @@ void verstage_mainboard_init(void);
#if CONFIG(VBOOT)
int vboot_developer_mode_enabled(void);
int vboot_recovery_mode_enabled(void);
-int vboot_recovery_mode_memory_retrain(void);
int vboot_can_enable_udc(void);
void vboot_run_logic(void);
int vboot_locate_cbfs(struct region_device *rdev);
#else /* !CONFIG_VBOOT */
static inline int vboot_developer_mode_enabled(void) { return 0; }
static inline int vboot_recovery_mode_enabled(void) { return 0; }
-static inline int vboot_recovery_mode_memory_retrain(void) { return 0; }
/* If VBOOT is not enabled, we are okay enabling USB device controller (UDC). */
static inline int vboot_can_enable_udc(void) { return 1; }
static inline void vboot_run_logic(void) {}