commit e5fec8c5bfc9e008c053dc56c4b104b88b1c1d9c
author Patrick Georgi <pgeorgi@google.com> Wed Oct 12 19:36:09 2016 +0200
committer chrome-bot <chrome-bot@chromium.org> Thu Nov 10 09:43:32 2016 -0800
tree 9c3d145b4eaee48af8d1ad40f49a15ca7ec8df49
parent 2fc662e72fdb568e7d57efcd4ae7d12c3791813c

cros_bundle_firmware: Fix the (unused) addition of files to RO and RW

BUG=chromium:595715
BRANCH=none
TEST=none

Change-Id: I3010600bc41169efff0cb91586c1328e8891f7c1
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/397280
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 338494b..224bae6 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -601,13 +601,14 @@
       fdt_text_base = text_base
     return fdt_text_base
 
-  def _AddCbfsFiles(self, bootstub, cbfs_files):
+  def _AddCbfsFiles(self, bootstub, cbfs_files, regions='COREBOOT'):
     for dir, subs, files in os.walk(cbfs_files):
       for file in files:
         file = os.path.join(dir, file)
         cbfs_name = file.replace(cbfs_files, '', 1).strip('/')
         self._tools.Run('cbfstool', [bootstub, 'add', '-f', file,
-                                '-n', cbfs_name, '-t', 'raw', '-c', 'lzma'])
+                                '-n', cbfs_name, '-t', 'raw', '-c', 'lzma',
+                                '-r', regions])
 
   def _CreateCorebootStub(self, coreboot):
     """Create a coreboot boot stub.
@@ -622,7 +623,8 @@
 
     # Add files to to RO and RW CBFS if provided.
     if self.cbfs_files:
-      self._AddCbfsFiles(bootstub, self.cbfs_files)
+      self._AddCbfsFiles(bootstub, self.cbfs_files,
+          'COREBOOT,FW_MAIN_A,FW_MAIN_B')
 
     # Add files to to RO CBFS if provided.
     if self.rocbfs_files: