[coreboot-gerrit] Patch set updated for coreboot: chromeos/gnvs: Clean up use of vboot handoff
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Tue Jul 26 22:40:57 CEST 2016
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15903
-gerrit
commit def7bda298b71f904d243963dc71902c16c7e1e7
Author: Furquan Shaikh <furquan at google.com>
Date: Tue Jul 26 10:13:56 2016 -0700
chromeos/gnvs: Clean up use of vboot handoff
BUG=chrome-os-partner:55639
Change-Id: I40a28f921499ddf43d8b423f5192ac93b40254c1
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
src/vendorcode/google/chromeos/gnvs.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index 26dbd48..d29efa8 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -20,13 +20,11 @@
#include <cbmem.h>
#include <console/console.h>
#include <elog.h>
+#include <vboot/vboot_common.h>
+#include <vboot_struct.h>
#include "chromeos.h"
#include "gnvs.h"
-#if CONFIG_VBOOT
-#include <vboot/vboot_common.h>
-#include <vboot_struct.h>
-#endif
chromeos_acpi_t *vboot_data = NULL;
static u32 me_hash_saved[8];
@@ -38,18 +36,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);
}
More information about the coreboot-gerrit
mailing list