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/southbridge/amd/pi/hudson/lpc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/southbridge/amd/pi/hudson/lpc.c') diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 282f17c1f1..da51cd042d 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -29,7 +29,6 @@ #include #include #include "hudson.h" -#include #include "pci_devs.h" static void lpc_init(device_t dev) @@ -78,10 +77,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 (); -- cgit v1.2.3