diff options
| author | David Hendricks <dhendrix@chromium.org> | 2015-05-26 16:48:39 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-25 02:11:47 +0000 |
| commit | dc600e8b129327e4f5a8cfbbe5343630f0f65b68 (patch) | |
| tree | cb741d3b7a0475e0837748036a77bc3e5dfdce5b | |
| parent | f843871cd5cc071ce1f6c15e8f1fd8036edc423b (diff) | |
| download | vboot-dc600e8b129327e4f5a8cfbbe5343630f0f65b68.tar.gz | |
crossystem: Check for "cros-ec" instead of "mkbp" for *NvStorage
This changes the string we look for in the devicetree on ARM
platforms to look for "cros-ec" (DT uses dashes instead of
underscores) instead of "mkbp".
BUG=chrome-os-partner:21097
CQ-DEPEND=CL:273347
BRANCH=none
TEST=with depthcharge patch applied, ran crossystem on newly
booted system and saw VBNV-related variables turn out the same.
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Change-Id: Iac43f5381327eb878a8d0db606b78bb7bdce816f
Reviewed-on: https://chromium-review.googlesource.com/273391
Commit-Queue: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@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 01e37c04..5d728b95 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -484,7 +484,7 @@ int VbReadNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbReadNvStorage_disk(vnc); - if (!strcmp(media, "mkbp") || !strcmp(media, "flash")) + if (!strcmp(media, "cros-ec") || !strcmp(media, "flash")) return VbReadNvStorage_mosys(vnc); return -1; } @@ -497,7 +497,7 @@ int VbWriteNvStorage(VbNvContext* vnc) { media = ReadFdtString(FDT_NVSTORAGE_TYPE_PROP); if (!strcmp(media, "disk")) return VbWriteNvStorage_disk(vnc); - if (!strcmp(media, "mkbp") || !strcmp(media, "flash")) + if (!strcmp(media, "cros-ec") || !strcmp(media, "flash")) return VbWriteNvStorage_mosys(vnc); return -1; } |