diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 532: Merged lp:~vishalbhoj/linaro-image-tools/panda-dt.

Message ID 20120625071911.32566.28831.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Milo Casagrande June 25, 2012, 7:19 a.m. UTC 
Merge authors:
  vishal (vishalbhoj)
Related merge proposals:
  https://code.launchpad.net/~vishalbhoj/linaro-image-tools/panda-dt/+merge/111352
  proposed by: vishal (vishalbhoj)
  review: Approve - Milo Casagrande (milo)
------------------------------------------------------------
revno: 532 [merge]
committer: Milo Casagrande <milo@ubuntu.com>
branch nick: trunk
timestamp: Mon 2012-06-25 09:18:02 +0200
message:
  Merged lp:~vishalbhoj/linaro-image-tools/panda-dt.
modified:
  linaro_image_tools/media_create/android_boards.py
  linaro_image_tools/media_create/tests/test_media_create.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/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-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2012-06-13 14:43:59 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-06-25 07:18:02 +0000
@@ -189,12 +189,14 @@ 
 
 
 class AndroidPandaConfig(AndroidOmapConfig, PandaConfig):
+    uboot_flavor = 'omap4_panda'
+    dtb_addr = '0x815f0000'
+    dtb_name = 'board.dtb'
     _extra_serial_opts = 'console=ttyO2,115200n8'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=48M '
         'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')
     android_specific_args = 'init=/init androidboot.console=ttyO2'
-    dtb_name = None
 
 
 class AndroidSnowballSdConfig(AndroidBoardConfig, SnowballSdConfig):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-06-13 14:11:28 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-06-25 07:18:02 +0000
@@ -1796,7 +1796,8 @@ 
                         'init=/init androidboot.console=ttyO2',
             'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
-                       'bootm 0x80200000 0x81600000'}
+                       'fatload mmc 0:1 0x815f0000 board.dtb; '
+                       'bootm 0x80200000 0x81600000 0x815f0000'}
         self.assertBootEnv(config, expected)
 
     def test_android_snowball_sd(self):