From baf88d370353771d9b48da0aac5bafd45da26042 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 26 Jul 2016 10:13:56 -0700 Subject: chromeos/gnvs: Clean up use of vboot handoff BUG=chrome-os-partner:55639 Change-Id: I40a28f921499ddf43d8b423f5192ac93b40254c1 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/15903 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Duncan Laurie --- src/vendorcode/google/chromeos/gnvs.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/vendorcode/google/chromeos/gnvs.c') diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 1f13d1c195..8a5cc64182 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -20,14 +20,12 @@ #include #include #include - -#include "chromeos.h" -#include "gnvs.h" -#if CONFIG_VBOOT #include #include #include -#endif + +#include "chromeos.h" +#include "gnvs.h" chromeos_acpi_t *vboot_data = NULL; static u32 me_hash_saved[8]; @@ -39,18 +37,11 @@ void chromeos_init_vboot(chromeos_acpi_t *chromeos) /* Copy saved ME hash into NVS */ memcpy(vboot_data->mehh, me_hash_saved, sizeof(vboot_data->mehh)); -#if CONFIG_VBOOT - /* Save the vdat from the vboot handoff structure. Downstream software - * consumes the data located in the ACPI table. Ensure it reflects - * the shared data from VbInit() and VbSelectFirmware(). */ struct vboot_handoff *vboot_handoff; - vboot_handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF); - - if (vboot_handoff != NULL) + if (vboot_get_handoff_info((void **)&vboot_handoff, NULL) == 0) memcpy(&chromeos->vdat[0], &vboot_handoff->shared_data[0], ARRAY_SIZE(chromeos->vdat)); -#endif chromeos_ram_oops_init(chromeos); } -- cgit v1.2.3