commit 250ecd4bf96ae33704edb738ab767ab3cf00c47b
author Patrick Georgi <pgeorgi@google.com> Wed Oct 12 18:22:50 2016 +0200
committer chrome-bot <chrome-bot@chromium.org> Thu Nov 10 07:40:02 2016 -0800
tree 0133f51b1f4172c0809bf65e0d41f0571f3be17b
parent 35147f624e37d6c80c0fe70c09d539d264842752

cros_bundle_firmware: Add correct GBB to cb_copy

BUG=chromium:595715
BRANCH=none
TEST=verify bit-equivalence of regions between image.bin and cb_with_fmap
with CL:397219 or similar.

Change-Id: I6aa5bbbf09957d219eaceb9c920a879223ca30ae
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/397359
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 6be7d72..1deedfd 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -1067,6 +1067,13 @@
         if label == 'gbb':
             fdt_path = '/flash/ro-gbb'
             fdt.PutString(fdt_path, 'type', 'blob gbb')
+            gbb = self._CreateGoogleBinaryBlock()
+            gbbdata = (self._tools.ReadFile(gbb) +
+                area['size']*'\x00')[:area['size']]
+            self._tools.WriteFile(gbb, gbbdata)
+            self._tools.Run('cbfstool', [
+              self.cb_copy, 'write',
+              '-r', 'GBB', '-f', gbb])
         elif label == 'fmap':
             fdt_path = '/flash/ro-fmap'
             fdt.PutString(fdt_path, 'type', 'fmap')