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/broadwell/lpc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/soc/intel/broadwell') diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c index 4430e73b46..ac80cbeb0d 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -44,8 +44,6 @@ #include #include #include -#include -#include static void pch_enable_ioapic(struct device *dev) { @@ -193,10 +191,7 @@ static void pch_rtc_init(struct device *dev) printk(BIOS_DEBUG, "rtc_failed = 0x%x\n", rtc_failed); } - if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS)) - init_vbnv_cmos(rtc_failed); - else - cmos_init(rtc_failed); + cmos_init(rtc_failed); } static const struct reg_script pch_misc_init_script[] = { -- cgit v1.2.3