[coreboot-gerrit] Patch set updated for coreboot: 46b32a6 vboot: Introduce kconfig variable for VBNV backing storage

[Aaron Durbin (adurbin@google.com)]

Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8777

-gerrit

commit 46b32a615a9b91b84069d3da66bed8d5b9602504
Author: David Hendricks <dhendrix at chromium.org>
Date:   Fri Aug 22 15:40:15 2014 -0700

    vboot: Introduce kconfig variable for VBNV backing storage
    
    This introduces a new kconfig variable to select the VBNV backing
    store explicitly instead of inferring it from CPU/SoC architecture.
    
    x86 platforms have historically relied only on CMOS to store VBNV
    variables, while ARM-based platforms have traditionally relied on
    the EC. Neither of those solutions are going to scale well into
    the future if/when CMOS disappears and we make ARM-based systems
    without an EC.
    
    BUG=chrome-os-partner:29546
    BRANCH=none
    TEST=compiled for nyan_blaze and samus
    
    Original-Signed-off-by: David Hendricks <dhendrix at chromium.org>
    Original-Change-Id: I4a8dadfb6bb666baf1ed4bec98b29c145dc4a1e7
    Original-Reviewed-on: https://chromium-review.googlesource.com/213877
    Original-Reviewed-by: Stefan Reinauer <reinauer at google.com>
    Original-Commit-Queue: Vadim Bendebury <vbendeb at chromium.org>
    Original-Tested-by: Vadim Bendebury <vbendeb at chromium.org>
    (cherry picked from commit d088fc71b2e2b45e826d3dedb8e536ad58b8d296)
    
    Change-Id: Iea325a8c4d07055143e993d89b827f86b8312330
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/vendorcode/google/chromeos/Kconfig      | 12 ++++++++++++
 src/vendorcode/google/chromeos/Makefile.inc |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 62d991b..69ecaf2 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -50,6 +50,18 @@ config VBNV_SIZE
 	  CMOS storage size for VbNv data. This value must match cmos.layout
 	  in the mainboard directory.
 
+config CHROMEOS_VBNV_CMOS
+	bool "Vboot non-volatile storage in CMOS."
+	default n
+	help
+	  VBNV is stored in CMOS
+
+config CHROMEOS_VBNV_EC
+	bool "Vboot non-volatile storage in EC."
+	default n
+	help
+	  VBNV is stored in EC
+
 config CHROMEOS_RAMOOPS
 	bool "Reserve space for Chrome OS ramoops"
 	default y
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 328c30d..32a76b9 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,10 +17,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv_cmos.c
-ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv_cmos.c
-romstage-$(CONFIG_ARCH_ROMSTAGE_ARMV7) += vbnv_ec.c
-ramstage-$(CONFIG_ARCH_RAMSTAGE_ARMV7) += vbnv_ec.c
+romstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c
+ramstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c
+romstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c
+ramstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c
 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
 ramstage-$(CONFIG_ELOG) += elog.c
 ramstage-y += gnvs.c