Merge lp:~milo/linaro-image-tools/bug1155702 into lp:linaro-image-tools/11.11

[Milo Casagrande]

Merge request for newly applied chagens: it was necessary to bump the value
for the samsung_env_start variable.

Tests have been updated accordingly.

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-03-20 15:58:42 +0000
+++ linaro_image_tools/media_create/boards.py	2013-03-21 14:13:33 +0000
@@ -1572,7 +1572,7 @@
         self.mmc_part_offset = 1
         self.samsung_bl1_len = 48
         self.samsung_bl2_start = 49
-        self.samsung_env_start = 1599
+        self.samsung_env_start = 1601
         self.serial_tty = 'ttySAC2'
         self._extra_serial_options = 'console=%s,115200n8'
 

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2013-03-20 15:59:15 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-03-21 14:13:33 +0000
@@ -1649,7 +1649,7 @@
         self.useFixture(fixture)
         expected_commands = [
                 ('sudo -E dd if=/dev/zero of= bs=512 conv=notrunc count=32 '
-                 'seek=1599'),
+                 'seek=1601'),
                 ('sudo -E dd if=boot/origen_quad.bl1.bin of= bs=512 '
                  'conv=notrunc seek=1'),
                 ('sudo -E dd if=boot/origen_quad-spl.bin.signed of= bs=512 '