diff mbox

[Branch,~linaro-maintainers/linaro-image-tools/trunk] Rev 322: Don't call make_dtb() on Samsung or pass a d_img_data file in the testsuite as

Message ID 20110421131916.9911.43784.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Loïc Minier April 21, 2011, 1:19 p.m. UTC 
------------------------------------------------------------
revno: 322
committer: Loïc Minier <lool@dooz.org>
branch nick: linaro-image-tools
timestamp: Thu 2011-04-21 15:12:57 +0200
message:
  Don't call make_dtb() on Samsung or pass a d_img_data file in the testsuite as
  this board doesn't set DTB config vars for now.
modified:
  linaro_image_tools/media_create/boards.py
  linaro_image_tools/media_create/tests/test_media_create.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-04-21 12:54:25 +0000
+++ linaro_image_tools/media_create/boards.py	2011-04-21 13:12:57 +0000
@@ -722,7 +722,6 @@ 
 
         make_uImage(cls.load_addr, k_img_data, boot_dir)
         make_uInitrd(i_img_data, boot_dir)
-        make_dtb(d_img_data, boot_dir)
 
         # unused at the moment once FAT support enabled for the
         # Samsung u-boot this can be used bug 727978

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-04-20 14:42:47 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-04-21 13:12:57 +0000
@@ -364,7 +364,7 @@ 
     def test_smdkv310(self):
         boot_commands = board_configs['smdkv310']._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
-            rootfs_uuid="deadbeef", d_img_data="smdkv310.dtb")
+            rootfs_uuid="deadbeef", d_img_data=None)
         expected = {
             'bootargs': 'console=ttySAC1,115200n8  root=UUID=deadbeef '
                         'rootwait ro',