summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-07-17 10:13:04 -0700
committerGerrit <chrome-bot@google.com>2012-07-17 13:11:44 -0700
commit33575a8892d2fcf24e34f62025bd0e3bc181d9e8 (patch)
treeab1701a4220408bb7a3a5c442ff7aed428c1fd21
parentd4faa060cc6445cf532e3f9c9cd785e0726f1b82 (diff)
downloadvboot-33575a8892d2fcf24e34f62025bd0e3bc181d9e8.tar.gz
Keep vbutil_ec from dying if EC firmware B isn't present
BUG=chrome-os-partner:11451 TEST=build bds firmware with ifdef CONFIG_FW_B removed from config.h Change-Id: I74ef0258988e065f602e4564e3b49903b34013c5 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/27655 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--utility/vbutil_ec.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/utility/vbutil_ec.c b/utility/vbutil_ec.c
index c1b280f6..4aa0d3f8 100644
--- a/utility/vbutil_ec.c
+++ b/utility/vbutil_ec.c
@@ -330,7 +330,9 @@ static int Verify(const char *filename) {
sprintf(buf, "FW_MAIN_%c", i);
if (!FindInFmap(fmap, buf, image, image_size, &fv_data, &fv_size)) {
printf("Can't find %s in %s\n", buf, filename);
- errorcnt++;
+ /* Not an error for firmware B */
+ if (i != 'B')
+ errorcnt++;
continue;
}
@@ -338,7 +340,9 @@ static int Verify(const char *filename) {
if (!FindInFmap(fmap, buf, image, image_size,
(uint8_t **)&key_block, &key_block_size)) {
printf("Can't find %s in %s\n", buf, filename);
- errorcnt++;
+ /* Not an error for firmware B */
+ if (i != 'B')
+ errorcnt++;
continue;
}