sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: remove init_vbnv_cmos()

Browse Source 
Instead of having each potential caller deal with the differences
of cmos_init() and init_vbnv_cmos() when VBOOT is enabled put the
correct logic within the callee, cmos_init(), for handling the
vbnv in CMOS. The internal __cmos_init() routine returns when the
CMOS area was cleared.

BUG=b:63054105

Change-Id: Ia124bcd61d3ac03e899a4ecf3645fc4b7a558f03
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/21549
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Aaron Durbin
2017-09-15 11:01:17 -06:00
parent aa51cd5c12
commit 9fde0d780d
8 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vboot/vbnv.h
View File

@@ -30,7 +30,6 @@ int vboot_wants_oprom(void);
/* CMOS backend */
void read_vbnv_cmos(uint8_t *vbnv_copy);
void save_vbnv_cmos(const uint8_t *vbnv_copy);
void init_vbnv_cmos(int rtc_fail);
/* Flash backend */
void read_vbnv_flash(uint8_t *vbnv_copy);

13
src/vboot/vbnv_cmos.c
View File

@@ -68,19 +68,6 @@ void save_vbnv_cmos(const uint8_t *vbnv_copy)
cmos_write(vbnv_copy[i], CONFIG_VBOOT_VBNV_OFFSET + 14 + i);
}
void init_vbnv_cmos(int rtc_fail)
{
uint8_t vbnv[VBOOT_VBNV_BLOCK_SIZE];
if (rtc_fail)
read_vbnv_cmos(vbnv);
cmos_init(rtc_fail);
if (rtc_fail)
save_vbnv_cmos(vbnv);
}
#if IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH)
static void back_up_vbnv_cmos(void *unused)
{