From eec8e33ecd31caf7e2df7209dfee0abaf97b0be2 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 4 Jun 2013 10:08:54 -0700 Subject: [PATCH] vboot: Do not pass OPROM_MATTERS flag to VbInit Since we are using VBNV to determine if developer mode is active we do not need the messy OPROM hook magic any longer. Change-Id: I1b9effef3ef2aa84e916060d8e61ee42515a2b7c Signed-off-by: Duncan Laurie Reviewed-on: https://gerrit.chromium.org/gerrit/57473 Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/4222 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/vendorcode/google/chromeos/gnvs.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index ba1588d70d..5ee366598a 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -49,15 +49,9 @@ void chromeos_init_vboot(chromeos_acpi_t *chromeos) vboot_handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF); - if (vboot_handoff != NULL) { - vboot_handoff->init_params.flags |= VB_INIT_FLAG_OPROM_MATTERS; - if (oprom_is_loaded) - vboot_handoff->init_params.flags |= - VB_INIT_FLAG_OPROM_LOADED; - + if (vboot_handoff != NULL) memcpy(&chromeos->vdat[0], &vboot_handoff->shared_data[0], ARRAY_SIZE(chromeos->vdat)); - } #endif #if CONFIG_ELOG