diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/stoneyridge/lpc.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/lpc.c | 7 | ||||
| -rw-r--r-- | src/soc/intel/common/block/rtc/rtc.c | 9 | ||||
| -rw-r--r-- | src/soc/intel/skylake/pmc.c | 7 |
4 files changed, 4 insertions, 25 deletions
diff --git a/src/soc/amd/stoneyridge/lpc.c b/src/soc/amd/stoneyridge/lpc.c index 75cedfe47f..7886433791 100644 --- a/src/soc/amd/stoneyridge/lpc.c +++ b/src/soc/amd/stoneyridge/lpc.c @@ -33,7 +33,6 @@ #include <soc/pci_devs.h> #include <soc/southbridge.h> #include <soc/nvs.h> -#include <vboot/vbnv.h> static void lpc_init(device_t dev) { @@ -86,10 +85,7 @@ static void lpc_init(device_t dev) * update CMOS unless it is invalid. * 1 tells cmos_init to always initialize the CMOS. */ - if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS)) - init_vbnv_cmos(0); - else - cmos_init(0); + cmos_init(0); /* Initialize i8259 pic */ setup_i8259(); 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[] = { 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 <intelblocks/rtc.h> #include <soc/pcr_ids.h> #include <pc80/mc146818rtc.h> -#include <vboot/vbnv.h> /* 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()); } diff --git a/src/soc/intel/skylake/pmc.c b/src/soc/intel/skylake/pmc.c index f3a2681dd5..df08937739 100644 --- a/src/soc/intel/skylake/pmc.c +++ b/src/soc/intel/skylake/pmc.c @@ -36,8 +36,6 @@ #include <cpu/x86/smm.h> #include <soc/pcr_ids.h> #include <soc/ramstage.h> -#include <vboot/vbnv.h> -#include <vboot/vbnv_layout.h> static const struct reg_script pch_pmc_misc_init_script[] = { /* SLP_S4=4s, SLP_S3=50ms, disable SLP_X stretching after SUS loss. */ @@ -124,10 +122,7 @@ static void pch_rtc_init(void) /* 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(rtc_failed); } static void pch_power_options(void) |