summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2014-10-07 18:04:17 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-09 20:43:45 +0000
commit1137139a2e0ea24a5fb7df3b621d4c0ec59daf81 (patch)
tree97e5fd9c53b2779dda1308fe7e95f1dff5a44f89
parent2b802de836e90ae65f3ea4ef391b6df2fc28aba3 (diff)
downloadvboot-1137139a2e0ea24a5fb7df3b621d4c0ec59daf81.tar.gz
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 <dhendrix@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/222061 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--host/arch/arm/lib/crossystem_arch.c4
1 files 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;
}