From 1137139a2e0ea24a5fb7df3b621d4c0ec59daf81 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Tue, 7 Oct 2014 18:04:17 -0700 Subject: crossystem: handle "flash" media in Vb*NvStorage() This handles VBNV data stored in SPI flash which happens to be the exact same way we handle VBNV data stored in the EC. BUG=chrome-os-partner:31529 BRANCH=none TEST=with CL:221349 applied, crossystem on storm no longer spews tons of errors Change-Id: I021d9f430acfac34dff44a927361a5a0e5ae2ff8 Signed-off-by: David Hendricks Reviewed-on: https://chromium-review.googlesource.com/222061 Reviewed-by: Vadim Bendebury Reviewed-by: Randall Spangler --- host/arch/arm/lib/crossystem_arch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 513539dd..6197e382 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -476,7 +476,7 @@ int VbReadNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbReadNvStorage_disk(vnc); - if (!strcmp(media, "mkbp")) + if (!strcmp(media, "mkbp") || !strcmp(media, "flash")) return VbReadNvStorage_mkbp(vnc); return -1; } @@ -489,7 +489,7 @@ int VbWriteNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbWriteNvStorage_disk(vnc); - if (!strcmp(media, "mkbp")) + if (!strcmp(media, "mkbp") || !strcmp(media, "flash")) return VbWriteNvStorage_mkbp(vnc); return -1; } -- cgit v1.2.1