[coreboot-gerrit] Patch set updated for coreboot: soc/intel/skylake: Use init_vbnv_cmos from vboot vbnv
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Wed Jul 27 23:36:58 CEST 2016
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15925
-gerrit
commit 22cc9ca2f7d0b633174f738cb44f0ee5d01f45f9
Author: Furquan Shaikh <furquan at google.com>
Date: Wed Jul 27 14:32:42 2016 -0700
soc/intel/skylake: Use init_vbnv_cmos from vboot vbnv
BUG=chrome-os-partner:55639
Change-Id: I7a536bc1cab51e7c942b2e0e48dfe18d8de08a6e
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
src/soc/intel/skylake/pmc.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/soc/intel/skylake/pmc.c b/src/soc/intel/skylake/pmc.c
index a8ec7b6..fd04287 100644
--- a/src/soc/intel/skylake/pmc.c
+++ b/src/soc/intel/skylake/pmc.c
@@ -106,24 +106,6 @@ static void pch_set_acpi_mode(void)
}
}
-#if IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS)
-/*
- * Preserve Vboot NV data when clearing CMOS as it will
- * have been re-initialized already by Vboot firmware init.
- */
-static void pch_cmos_init_preserve(int reset)
-{
- uint8_t vbnv[VBOOT_VBNV_BLOCK_SIZE];
- if (reset)
- read_vbnv(vbnv);
-
- cmos_init(reset);
-
- if (reset)
- save_vbnv(vbnv);
-}
-#endif
-
static void pch_rtc_init(void)
{
u8 reg8;
@@ -141,11 +123,10 @@ 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)
- pch_cmos_init_preserve(rtc_failed);
-#else
- cmos_init(rtc_failed);
-#endif
+ if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS))
+ init_vbnv_cmos(rtc_failed);
+ else
+ cmos_init(rtc_failed);
}
static void pmc_gpe_init(config_t *config)
More information about the coreboot-gerrit
mailing list