diff options
| author | David Hendricks <dhendrix@chromium.org> | 2015-06-29 15:05:58 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-30 10:47:49 +0000 |
| commit | fbf631c845c08299f0bcbae3f311c5807d34c0d6 (patch) | |
| tree | 16b1c866d8d6d8e86c032ef89fc643e438741a53 | |
| parent | dc600e8b129327e4f5a8cfbbe5343630f0f65b68 (diff) | |
| download | vboot-fbf631c845c08299f0bcbae3f311c5807d34c0d6.tar.gz | |
crossystem: Add check for "mkbp" back
We may have been over-zealous earlier when trying to eliminate
references to mkbp. Since crossystem runs on all ChromeOS devices,
this re-adds "mkbp" back to mitigate the risk of encountering
problems on systems running newer versions of ChromeOS but with
older firmware.
BUG=chrome-os-partner:21097
BRANCH=none
TEST=Compiled for veyron_brain
Change-Id: Ia0086687fbc3a1195b062367ccb6ee5c41acd026
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/282602
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | host/arch/arm/lib/crossystem_arch.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 5d728b95..6c745ff2 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -484,7 +484,8 @@ int VbReadNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbReadNvStorage_disk(vnc); - if (!strcmp(media, "cros-ec") || !strcmp(media, "flash")) + if (!strcmp(media, "cros-ec") || !strcmp(media, "mkbp") || + !strcmp(media, "flash")) return VbReadNvStorage_mosys(vnc); return -1; } @@ -497,7 +498,8 @@ int VbWriteNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbWriteNvStorage_disk(vnc); - if (!strcmp(media, "cros-ec") || !strcmp(media, "flash")) + if (!strcmp(media, "cros-ec") || !strcmp(media, "mkbp") || + !strcmp(media, "flash")) return VbWriteNvStorage_mosys(vnc); return -1; } |