From e482cebcb6943c0fc5c21cc8810de0206a763540 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 24 May 2016 14:50:45 -0500 Subject: [PATCH] UPSTREAM: vendorcode/google/chromeos/vboot2: use cbmem for postcar region selection When the vboot cbfs selection runs in postcar stage it should be utilizing cbmem to locate the vboot selected region. BUG=None BRANCH=None TEST=None Change-Id: I027ba19438468bd690d74ae55007393f051fde42 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://review.coreboot.org/14959 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Furquan Shaikh Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/347380 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- src/vendorcode/google/chromeos/vboot2/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vendorcode/google/chromeos/vboot2/common.c b/src/vendorcode/google/chromeos/vboot2/common.c index 4282408535..749f328a01 100644 --- a/src/vendorcode/google/chromeos/vboot2/common.c +++ b/src/vendorcode/google/chromeos/vboot2/common.c @@ -65,8 +65,8 @@ static struct selected_region *vb2_selected_region(void) { struct selected_region *sel_reg = NULL; - /* Ramstage always uses cbmem as a source of truth. */ - if (ENV_RAMSTAGE) + /* Ramstage and postcar always uses cbmem as a source of truth. */ + if (ENV_RAMSTAGE || ENV_POSTCAR) sel_reg = cbmem_find(CBMEM_ID_VBOOT_SEL_REG); else if (ENV_ROMSTAGE) { /* Try cbmem first. Fall back on working data if not found. */