commit dcc5a5c51231e45665b55e427b6001a03752cfca
author Vadim Bendebury <vbendeb@chromium.org> Mon Jun 10 13:45:36 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Jun 10 18:08:35 2013 -0700
tree d1d96053b77fd9ac19c6cbf54d47f7563897b5e6
parent 94a3ac6572647182b8e2d0793d257bbadb9c7ce6

cros_bundle_firmware: use  exynos.py in write_firmware.py

The earlier refactor of Exynos BL2 image processing left behind a call
site in write_firmware.

This change fixes the problem.

BUG=chrome-os-partner:18447
TEST=manual
   . cros_write_firmware now succeeds

Change-Id: I4027f3775e3661506c3d8af569ebf711d3d7bc8f
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/58120
Reviewed-by: Simon Glass <sjg@chromium.org>

host/lib/write_firmware.py

diff --git a/host/lib/write_firmware.py b/host/lib/write_firmware.py
index 3b205f4..c486423 100644
--- a/host/lib/write_firmware.py
+++ b/host/lib/write_firmware.py
@@ -8,6 +8,8 @@
 import re
 import struct
 import time
+
+from exynos import ExynosBl2
 from tools import CmdError
 
 def RoundUp(value, boundary):
@@ -676,10 +678,10 @@
       raw_image = self._PrepareFlasher(uboot, payload, flash_dest, '1:0')
       bl1, bl2, _ = self._ExtractPayloadParts(payload, True)
       spl_load_size = os.stat(raw_image).st_size
-      bl2 = self._bundle.ConfigureExynosBl2(self._fdt, spl_load_size, bl2,
-                                            'flasher')
 
-      data = self._tools.ReadFile(bl1) + self._tools.ReadFile(bl2)
+      bl2_handler = ExynosBl2(self._tools, self._out)
+      bl2_file = bl2_handler.Configure(self._fdt, spl_load_size, bl2, 'flasher')
+      data = self._tools.ReadFile(bl1) + self._tools.ReadFile(bl2_file)
 
       # Pad BL2 out to the required size.
       # We require that it be 24KB, but data will only contain 8KB + 14KB.