commit c092b383de3856fd28c104a510106b0c88e7fc1b
author Patrick Georgi <pgeorgi@google.com> Wed Oct 12 16:35:14 2016 +0200
committer chrome-bot <chrome-bot@chromium.org> Thu Nov 03 00:37:18 2016 -0700
tree 89bde0953e791b1e0044501d14b7a3bfe6de4642
parent 29b24cea29c04a2edd86fbb535213b85e007cabb

cros_bundle_firmware: create coreboot stub earlier

This allows the fmap->fdt conversion loop to already fill in some
regions.

BUG=chromium:595715
BRANCH=none
TEST=none

Change-Id: Ib49095691b4646eed673a1ef6d07de8063da1f38
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/397123
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 4f67eaf..d990480 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -812,7 +812,6 @@
     complete = False
     deferred_list = []
 
-    self._CreateCorebootStub(self.coreboot_fname)
     pack.AddProperty('coreboot', self.bootstub)
     pack.AddProperty('image', self.bootstub)
 
@@ -1014,6 +1013,8 @@
     if fdt.GetProp('/flash', 'reg', ''):
       raise ValueError('fmap.dts /flash is deprecated. Use chromeos.fmd')
 
+    self._CreateCorebootStub(self.coreboot_fname)
+
     # fill in /flash from binary fmap
     # ignore "read-only" attribute, that isn't used anywhere
     fmap_blob = open(self.coreboot_fname).read()