diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-26 01:16:42 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-26 01:16:42 +0200 |
| commit | f43d50f2dd5cc826ec8a9df5ff167a63a4cb8d54 (patch) | |
| tree | e5e10335b4c7fc41816b7836a622d3da4fba6935 /linaro_image_tools/media_create | |
| parent | c6080b9226103616ad1bd9c339f1edab070a32ae (diff) | |
partly revert trunk merge to fix a regression
Diffstat (limited to 'linaro_image_tools/media_create')
| -rw-r--r-- | linaro_image_tools/media_create/boards.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linaro_image_tools/media_create/boards.py b/linaro_image_tools/media_create/boards.py index 30fe9a1..1514227 100644 --- a/linaro_image_tools/media_create/boards.py +++ b/linaro_image_tools/media_create/boards.py @@ -541,9 +541,9 @@ class BoardConfig(object): if d_img_data is not None: assert self.dtb_addr is not None, ( "Need a dtb_addr when passing d_img_data") - boot_script += (("%(fatload_command)s %(load_interface)s " - "%(mmc_option)s %(dtb_addr)s ")) % replacements - boot_script += "%s; " % d_img_data + boot_script += ( + ("%(fatload_command)s %(load_interface)s %(mmc_option)s " + "%(dtb_addr)s board.dtb; ")) % replacements boot_script += (("bootm %(kernel_addr)s")) % replacements if i_img_data is not None: boot_script += ((" %(initrd_addr)s")) % replacements |