diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 562: [merge] Added support for device tree for Android on Snowball.

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

Commit Message

Georgy Redkozubov Sept. 20, 2012, 9:04 a.m. UTC 
Merge authors:
  Patrik Ryd (patrik-ryd)
Related merge proposals:
  https://code.launchpad.net/~patrik-ryd/linaro-image-tools/linaro-image-tools/+merge/124623
  proposed by: Patrik Ryd (patrik-ryd)
  review: Approve - Georgy Redkozubov (gesha)
  review: Approve - Deepti B. Kalakeri (deeptik)
------------------------------------------------------------
revno: 562 [merge]
committer: Georgy Redkozubov <georgy.redkozubov@linaro.org>
branch nick: lit-trunk
timestamp: Thu 2012-09-20 13:03:00 +0400
message:
  [merge] Added support for device tree for Android on Snowball.
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-08-05 09:22:09 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-09-20 08:08:10 +0000
@@ -210,7 +210,8 @@ 
         'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=500M')
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
-    dtb_name = None
+    dtb_name = 'board.dtb'
+    dtb_addr = '0x8000000'
 
 
 class AndroidSnowballEmmcConfig(AndroidBoardConfig, SnowballEmmcConfig):
@@ -222,7 +223,8 @@ 
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
     mmc_option = '0:2'
-    dtb_name = None
+    dtb_name = 'board.dtb'
+    dtb_addr = '0x8000000'
 
     @classmethod
     def get_sfdisk_cmd(cls, should_align_boot_part=False):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-09-10 17:50:26 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-09-20 08:19:28 +0000
@@ -1970,7 +1970,8 @@ 
                         'vmalloc=500M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
                        'fatload mmc 1:1 0x05000000 uInitrd; '
-                       'bootm 0x00100000 0x05000000'}
+                       'fatload mmc 1:1 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000'}
         self.assertBootEnv(
             android_boards.AndroidSnowballSdConfig, expected)
 
@@ -1983,7 +1984,8 @@ 
                         'vmalloc=500M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
                        'fatload mmc 0:2 0x05000000 uInitrd; '
-                       'bootm 0x00100000 0x05000000'}
+                       'fatload mmc 0:2 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000'}
         self.assertBootEnv(
             android_boards.AndroidSnowballEmmcConfig, expected)