commit d65f65f02e7d123ab1ecaa7b10261d4e2ad2491e
author Simon Glass <sjg@chromium.org> Thu Mar 28 17:03:41 2013 -0700
committer ChromeBot <chrome-bot@google.com> Fri Mar 29 10:44:21 2013 -0700
tree 40ca1d8e828c60ba1e0a58b093f3dfc57898c500
parent 40836b21dd61fb48a6528ec83238975aa63708b0

cros_bundle_firmware: Extract TEXT_BASE always

We need this for the SD flasher always, so let's calculate the U-Boot
TEXT_BASE for both USB and SD boot.

BUG=chrome-os-partner:18451
TEST=Manual

Use this to write to SD card:

$ cros_bundle_firmware -b peach_pit -s -M exynos -F spi -w sd:.

Then insert SD card in pit, boot from SD and see that it flashes correctly.

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

host/lib/write_firmware.py

diff --git a/host/lib/write_firmware.py b/host/lib/write_firmware.py
index 95e0b5c..629eb2d 100644
--- a/host/lib/write_firmware.py
+++ b/host/lib/write_firmware.py
@@ -802,16 +802,16 @@
   """
   write = WriteFirmware(tools, fdt, output, bundle, update, verify)
   write.SelectServo(servo)
+  if flash_dest:
+    write.text_base = bundle.CalcTextBase('flasher ', fdt, flasher)
+  elif bootstub:
+    write.text_base = bundle.CalcTextBase('bootstub ', fdt, bootstub)
   if dest == 'usb':
     try:
       write.DutControl(['cpu_uart_capture:on',])
       method = fdt.GetString('/chromeos-config', 'flash-method', method)
       if method == 'tegra':
         tools.CheckTool('tegrarcm')
-        if flash_dest:
-          write.text_base = bundle.CalcTextBase('flasher ', fdt, flasher)
-        elif bootstub:
-          write.text_base = bundle.CalcTextBase('bootstub ', fdt, bootstub)
         ok = write.NvidiaFlashImage(flash_dest, flasher, file_list['bct'],
             image_fname, bootstub)
       elif method == 'exynos':