cros_bundle_firmware: Add files in cbfs/ and rocbfs/ in one go.
That copy doesn't happen anymore (because RW is legitimately different
from RO now), so we don't need to be careful about the order of the
step.
On the upside, cb_with_fmap is much more similar to image.bin now.
BUG=chromium:595715
BRANCH=none
TEST=built and made sure that FW_MAIN_[AB] don't contain the RO-only
files.
Change-Id: I3e47647f3a779c1180f15a9c6b3d2ca038b1e25f
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/397279
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 1deedfd..338494b 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -624,22 +624,17 @@
if self.cbfs_files:
self._AddCbfsFiles(bootstub, self.cbfs_files)
- # Create a coreboot copy to use as a scratch pad. Order matters. The
- # cbfs_files were added prior to this action. That's so the RW CBFS
- # regions inherit the files from the RO CBFS region.
+ # Add files to to RO CBFS if provided.
+ if self.rocbfs_files:
+ self._AddCbfsFiles(bootstub, self.rocbfs_files)
+
+ # Create a coreboot copy to use as a scratch pad.
cb_copy = os.path.abspath(os.path.join(self._tools.outdir, 'cb_with_fmap'))
self._tools.WriteFile(cb_copy, self._tools.ReadFile(bootstub))
binary = self._tools.ReadFile(bootstub)
self._tools.WriteFile(cb_copy, binary)
-
self.cb_copy = cb_copy
- # Add files to to RO CBFS if provided. This done here such that the
- # copy above does not contain the RO CBFS files.
- if self.rocbfs_files:
- self._AddCbfsFiles(bootstub, self.rocbfs_files)
-
-
def _PackOutput(self, msg):
"""Helper function to write output from PackFirmware (verbose level 2).
