From f14f5f1d59890eff93aa635261b053852890b3f8 Mon Sep 17 00:00:00 2001
From: Marc Jones <marcj303@gmail.com>
Date: Thu, 20 Apr 2017 16:55:24 -0600
Subject: [PATCH] UPSTREAM: amd/pi/hudson: Add VBNV cmos reset option

If the mainboard supports VBNV, call init_vbnv_cmos() instead of
the normal init_cmos(). The VBNV version does some VBNV pre
and post setup around the normal init_cmos().

BUG=none
BRANCH=none
TEST=none

Change-Id: I6754b2789175ea9bd61235bcecdf1ffdc7fccb42
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 956a58e4fe7d0649ba4d5ab6128a8510d4146199
Original-Change-Id: I34b02409019b945cd68c830e006e99338643f29c
Original-Signed-off-by: Marc Jones <marcj303@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/19399
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/490072
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
---
 src/southbridge/amd/pi/hudson/lpc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index 60a1b88bae..c18a5590fa 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -29,6 +29,7 @@
 #include <pc80/i8254.h>
 #include <pc80/i8259.h>
 #include "hudson.h"
+#include <vboot/vbnv.h>
 
 static void lpc_init(device_t dev)
 {
@@ -76,7 +77,10 @@ static void lpc_init(device_t dev)
 	 * update CMOS unless it is invalid.
 	 * 1 tells cmos_init to always initialize the CMOS.
 	 */
-	cmos_init(0);
+	if (IS_ENABLED(CONFIG_VBOOT_VBNV_CMOS))
+		init_vbnv_cmos(0);
+	else
+		cmos_init(0);
 
 	/* Initialize i8259 pic */
 	setup_i8259 ();