Linaro Image Tools

Merge lp:~vishalbhoj/linaro-image-tools/panda-dt into lp:linaro-image-tools/11.11

  1. panda-dt
  2. Merge into trunk
Proposed by vishal
Status: Merged
Approved by: Milo Casagrande
Approved revision: 518
Merged at revision: 532
Proposed branch: lp:~vishalbhoj/linaro-image-tools/panda-dt
Merge into: lp:linaro-image-tools/11.11
Diff against target: 33 lines (+5/-2)
2 files modified
linaro_image_tools/media_create/android_boards.py (+3/-1)
linaro_image_tools/media_create/tests/test_media_create.py (+2/-1)
To merge this branch: bzr merge lp:~vishalbhoj/linaro-image-tools/panda-dt
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Данило Шеган Pending
Review via email: mp+111352@code.launchpad.net

Description of the change

I have reworked the device tree support for panda so that it doesn't affect the other boards. Please review the change

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Hello vishal,

thanks for working on this!
Merge proposal looks good to me. If you can, go ahead with the merge too, otherwise tell us.

review: Approve
Revision history for this message
Milo Casagrande (milo) wrote :

Hello,

vishal replied to me privately asking to merge and push these changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_image_tools/media_create/android_boards.py'
2--- linaro_image_tools/media_create/android_boards.py 2012-06-13 14:43:59 +0000
3+++ linaro_image_tools/media_create/android_boards.py 2012-06-21 07:18:23 +0000
4@@ -189,12 +189,14 @@
5
6
7 class AndroidPandaConfig(AndroidOmapConfig, PandaConfig):
8+ uboot_flavor = 'omap4_panda'
9+ dtb_addr = '0x815f0000'
10+ dtb_name = 'board.dtb'
11 _extra_serial_opts = 'console=ttyO2,115200n8'
12 extra_boot_args_options = (
13 'earlyprintk fixrtc nocompcache vram=48M '
14 'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')
15 android_specific_args = 'init=/init androidboot.console=ttyO2'
16- dtb_name = None
17
18
19 class AndroidSnowballSdConfig(AndroidBoardConfig, SnowballSdConfig):
20
21=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
22--- linaro_image_tools/media_create/tests/test_media_create.py 2012-06-13 14:11:28 +0000
23+++ linaro_image_tools/media_create/tests/test_media_create.py 2012-06-21 07:18:23 +0000
24@@ -1796,7 +1796,8 @@
25 'init=/init androidboot.console=ttyO2',
26 'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
27 'fatload mmc 0:1 0x81600000 uInitrd; '
28- 'bootm 0x80200000 0x81600000'}
29+ 'fatload mmc 0:1 0x815f0000 board.dtb; '
30+ 'bootm 0x80200000 0x81600000 0x815f0000'}
31 self.assertBootEnv(config, expected)
32
33 def test_android_snowball_sd(self):

Subscribers

People subscribed via source and target branches