diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2017-09-15 11:01:17 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2017-09-20 23:53:23 +0000 |
| commit | 9fde0d780dd0abd24119ff6f7854b4b5939ce7d2 (patch) | |
| tree | 2a42e542b93e2dc73712182a634a9483f512cc1a /src/soc/intel/broadwell | |
| parent | aa51cd5c12596b0b6d5f61eb1108091bf3a4fd3f (diff) | |
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 <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>
Diffstat (limited to 'src/soc/intel/broadwell')
| -rw-r--r-- | src/soc/intel/broadwell/lpc.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 <arch/acpi.h> #include <arch/acpigen.h> #include <cpu/cpu.h> -#include <vboot/vbnv.h> -#include <vboot/vbnv_layout.h> 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[] = { |