From 9fde0d780dd0abd24119ff6f7854b4b5939ce7d2 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 15 Sep 2017 11:01:17 -0600 Subject: vboot: remove init_vbnv_cmos() 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 Reviewed-on: https://review.coreboot.org/21549 Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/soc/intel/common/block/rtc/rtc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/soc/intel/common/block/rtc/rtc.c') diff --git a/src/soc/intel/common/block/rtc/rtc.c b/src/soc/intel/common/block/rtc/rtc.c index 04c07687db..9e76768e65 100644 --- a/src/soc/intel/common/block/rtc/rtc.c +++ b/src/soc/intel/common/block/rtc/rtc.c @@ -17,7 +17,6 @@ #include #include #include -#include /* RTC PCR configuration */ #define PCR_RTC_CONF 0x3400 @@ -39,14 +38,8 @@ __attribute__((weak)) int soc_get_rtc_failed(void) void rtc_init(void) { - int rtc_failed; - - rtc_failed = soc_get_rtc_failed(); /* Ensure the date is set including century byte. */ cmos_check_update_date(); - if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS)) - init_vbnv_cmos(rtc_failed); - else - cmos_init(rtc_failed); + cmos_init(soc_get_rtc_failed()); } -- cgit v1.2.3