aboutsummaryrefslogtreecommitdiff
path: root/linaro_image_tools/media_create/boards.py
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2013-01-12 08:39:45 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2013-01-12 08:39:45 +0200
commitbfc6449d96df09e1d99c74661ae479c1117cade9 (patch)
tree2d499ff4bcd4110717cd51f31c9031f983df0b42 /linaro_image_tools/media_create/boards.py
parent4b2cc26ff26153c07fd1fec6bc881b44d565674e (diff)
downloadlinaro-image-tools-bfc6449d96df09e1d99c74661ae479c1117cade9.tar.gz
Fix samsung_{bl1,bl2,env}_{start,len} metadata initialisation.
samsung_v310_* are obsolete and initialized instead of the correct variables. Incorrect values are passed to dd, hence we create an image file filling all drive space.
Diffstat (limited to 'linaro_image_tools/media_create/boards.py')
-rw-r--r--linaro_image_tools/media_create/boards.py32
1 files changed, 20 insertions, 12 deletions
diff --git a/linaro_image_tools/media_create/boards.py b/linaro_image_tools/media_create/boards.py
index 05d42f0..a7c2ac7 100644
--- a/linaro_image_tools/media_create/boards.py
+++ b/linaro_image_tools/media_create/boards.py
@@ -376,25 +376,33 @@ class BoardConfig(object):
samsung_bl1_start = self.get_metadata_field(
SAMSUNG_BL1_START_FIELD)
if samsung_bl1_start:
- self.samsung_v310_bl1_start = int(samsung_bl1_start)
- samsung_bl1_len = self.get_metadata_field(SAMSUNG_BL1_LEN_FIELD)
+ self.samsung_bl1_start = int(samsung_bl1_start)
+
+ samsung_bl1_len = self.get_metadata_field(
+ SAMSUNG_BL1_LEN_FIELD)
if samsung_bl1_len:
- self.samsung_v310_bl1_len = int(samsung_bl1_len)
- samsung_env_len = self.get_metadata_field(SAMSUNG_ENV_LEN_FIELD)
- if samsung_env_len:
- self.samsung_v310_env_len = int(samsung_env_len)
- samsung_bl2_start = \
- self.get_metadata_field(SAMSUNG_BL2_START_FIELD)
+ self.samsung_bl1_len = int(samsung_bl1_len)
+
+ samsung_bl2_start = self.get_metadata_field(
+ SAMSUNG_BL2_START_FIELD)
if samsung_bl2_start:
self.samsung_bl2_start = int(samsung_bl2_start)
- samsung_bl2_len = self.get_metadata_field(SAMSUNG_BL2_LEN_FIELD)
+
+ samsung_bl2_len = self.get_metadata_field(
+ SAMSUNG_BL2_LEN_FIELD)
if samsung_bl2_len:
- self.samsung_v310_bl2_len = int(samsung_bl2_len)
- samsung_env_start = \
- self.get_metadata_field(SAMSUNG_ENV_START_FIELD)
+ self.samsung_bl2_len = int(samsung_bl2_len)
+
+ samsung_env_start = self.get_metadata_field(
+ SAMSUNG_ENV_START_FIELD)
if samsung_env_start is not None:
self.samsung_env_start = int(samsung_env_start)
+ samsung_env_len = self.get_metadata_field(
+ SAMSUNG_ENV_LEN_FIELD)
+ if samsung_env_len:
+ self.samsung_env_len = int(samsung_env_len)
+
self.bootloader_copy_files = self.hardwarepack_handler.get_field(
"bootloader_copy_files")[0]