From fbf631c845c08299f0bcbae3f311c5807d34c0d6 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Mon, 29 Jun 2015 15:05:58 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/282602 Reviewed-by: Randall Spangler Reviewed-by: Julius Werner --- host/arch/arm/lib/crossystem_arch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'host/arch') 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; } -- cgit v1.2.1