cros_bundle_firmware: Use original fmap

Instead of reading the original fmap, creating an fdt from that, and
then recreating a new fmap, just reuse the original fmap.

BUG=chromium:595715
BRANCH=none
TEST=sudo emerge cros-devutils && emerge-veyron_pinky chromeos-bootimage

Change-Id: I9ae09ddb57a010c6a9690d2448461e36c9290219
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/393755
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index b19848a..a40795c 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -625,16 +625,10 @@
 
     # 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. Additionally,
-    # include the full FMAP within the file.
+    # regions inherit the files from the RO CBFS region.
     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)
-    fmap_offset, fmap = pack.GetFmap()
-    if len(binary) < fmap_offset + len(fmap):
-        raise CmdError('FMAP will not fit')
-    # Splice in FMAP data.
-    binary = binary[:fmap_offset] + fmap + binary[fmap_offset + len(fmap):]
     self._tools.WriteFile(cb_copy, binary)
     # Publish where coreboot is with the FMAP data.
     pack.AddProperty('cb_with_fmap', cb_copy)