sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: Use init_vbnv_cmos from vboot vbnv

Browse Source 
BUG=chrome-os-partner:55639

Change-Id: I7a536bc1cab51e7c942b2e0e48dfe18d8de08a6e
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/15925
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Furquan Shaikh
2016-07-27 14:32:42 -07:00
parent 0faf401823
commit 3339861435
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/soc/intel/skylake/pmc.c
View File

@@ -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) static void pch_rtc_init(void)
{ {
u8 reg8; u8 reg8;
@@ -141,11 +123,10 @@ static void pch_rtc_init(void)
/* Ensure the date is set including century byte. */ /* Ensure the date is set including century byte. */
cmos_check_update_date(); cmos_check_update_date();
#if IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS) if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS))
pch_cmos_init_preserve(rtc_failed); init_vbnv_cmos(rtc_failed);
#else else
cmos_init(rtc_failed); cmos_init(rtc_failed);
#endif
} }
static void pmc_gpe_init(config_t *config) static void pmc_gpe_init(config_t *config)