Linaro Image Tools

Merge lp:~doanac/linaro-image-tools/overo-updates into lp:linaro-image-tools/11.11

  1. overo-updates
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Merged at revision: 342
Proposed branch: lp:~doanac/linaro-image-tools/overo-updates
Merge into: lp:linaro-image-tools/11.11
Diff against target: 46 lines (+4/-7)
2 files modified
linaro_image_tools/media_create/boards.py (+3/-4)
linaro_image_tools/media_create/tests/test_media_create.py (+1/-3)
To merge this branch: bzr merge lp:~doanac/linaro-image-tools/overo-updates
Reviewer Review Type Date Requested Status
Loïc Minier (community) Approve
Review via email: mp+61789@code.launchpad.net

Description of the change

The new kernel John is doing (2.6.38-1003) removes the need to specify video resolution on Overo. In addition video on the latest kernel is broken, so the parameters serve no purpose.

The first commit removes the junk no longer needed.

The second commit is optional. It allows variables to be expanded in bootargs.

To post a comment you must log in.
Revision history for this message
Mattias Backman (mabac) wrote :

Looks good to me. I can't see a reason for not having expandable variables in bootargs. Is there anyone else who does?

Revision history for this message
Loïc Minier (lool) wrote :

 review approve

 Since this for 2.6.38, I guess it's for 11.05? Anyway, LGTM if this
 doesn't break any supported hwpack

--
Loïc Minier

review: Approve

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/boards.py'
2--- linaro_image_tools/media_create/boards.py 2011-05-20 13:41:31 +0000
3+++ linaro_image_tools/media_create/boards.py 2011-05-20 15:38:39 +0000
4@@ -270,7 +270,7 @@
5 boot_env = cls._get_boot_env(is_live, is_lowmem, consoles, rootfs_uuid,
6 d_img_data)
7 cls._make_boot_files(
8- boot_env, chroot_dir, boot_dir,
9+ boot_env, chroot_dir, boot_dir,
10 boot_device_or_file, k_img_data, i_img_data, d_img_data)
11
12 @classmethod
13@@ -433,8 +433,7 @@
14 load_addr = '0x80008000'
15 boot_script = 'boot.scr'
16 extra_boot_args_options = (
17- 'earlyprintk mpurate=500 vram=12M '
18- 'omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi')
19+ 'earlyprintk mpurate=${mpurate} vram=12M')
20
21
22 class PandaConfig(OmapConfig):
23@@ -914,7 +913,7 @@
24 def make_boot_script(boot_env, boot_script_path):
25 boot_script_data = (
26 "setenv bootcmd '%(bootcmd)s'\n"
27- "setenv bootargs '%(bootargs)s'\n"
28+ "setenv bootargs %(bootargs)s\n"
29 "boot"
30 % boot_env)
31
32
33=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
34--- linaro_image_tools/media_create/tests/test_media_create.py 2011-05-20 08:24:17 +0000
35+++ linaro_image_tools/media_create/tests/test_media_create.py 2011-05-20 15:38:39 +0000
36@@ -497,9 +497,7 @@
37 expected = {
38 'bootargs': 'console=tty0 console=ttyO2,115200n8 '
39 'root=UUID=deadbeef rootwait ro earlyprintk '
40- 'mpurate=500 vram=12M '
41- 'omapfb.mode=dvi:1024x768MR-16@60 '
42- 'omapdss.def_disp=dvi',
43+ 'mpurate=${mpurate} vram=12M',
44 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
45 'fatload mmc 0:1 0x81600000 uInitrd; '
46 'fatload mmc 0:1 0x815f0000 board.dtb; '

Subscribers

People subscribed via source and target branches