diff options
| author | David Hendricks <dhendrix@chromium.org> | 2014-10-07 18:04:17 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-20 16:40:47 +0000 |
| commit | 4668b571d35b71f0e6d1fba42fcad2e318f1b39c (patch) | |
| tree | 97e5fd9c53b2779dda1308fe7e95f1dff5a44f89 | |
| parent | 4b0110b9a65024c7ccb40b771b3c9271fdef7b4c (diff) | |
| download | vboot-4668b571d35b71f0e6d1fba42fcad2e318f1b39c.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
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>
(cherry picked from commit 1137139a2e0ea24a5fb7df3b621d4c0ec59daf81)
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Change-Id: I021d9f430acfac34dff44a927361a5a0e5ae2ff8
Reviewed-on: https://chromium-review.googlesource.com/224315
Tested-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Commit-Queue: Duncan Laurie <dlaurie@chromium.org>
| -rw-r--r-- | host/arch/arm/lib/crossystem_arch.c | 4 |
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; } |