commit 33575a8892d2fcf24e34f62025bd0e3bc181d9e8
author Randall Spangler <rspangler@chromium.org> Tue Jul 17 10:13:04 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jul 17 13:11:44 2012 -0700
tree ab1701a4220408bb7a3a5c442ff7aed428c1fd21
parent d4faa060cc6445cf532e3f9c9cd785e0726f1b82

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>

utility/vbutil_ec.c

diff --git a/utility/vbutil_ec.c b/utility/vbutil_ec.c
index c1b280f..4aa0d3f 100644
--- a/utility/vbutil_ec.c
+++ b/utility/vbutil_ec.c
@@ -330,7 +330,9 @@
     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 @@
     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;
     }