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
=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py 2011-05-20 13:41:31 +0000
+++ linaro_image_tools/media_create/boards.py 2011-05-20 15:38:39 +0000
@@ -270,7 +270,7 @@
270 boot_env = cls._get_boot_env(is_live, is_lowmem, consoles, rootfs_uuid,270 boot_env = cls._get_boot_env(is_live, is_lowmem, consoles, rootfs_uuid,
271 d_img_data)271 d_img_data)
272 cls._make_boot_files(272 cls._make_boot_files(
273 boot_env, chroot_dir, boot_dir, 273 boot_env, chroot_dir, boot_dir,
274 boot_device_or_file, k_img_data, i_img_data, d_img_data)274 boot_device_or_file, k_img_data, i_img_data, d_img_data)
275275
276 @classmethod276 @classmethod
@@ -433,8 +433,7 @@
433 load_addr = '0x80008000'433 load_addr = '0x80008000'
434 boot_script = 'boot.scr'434 boot_script = 'boot.scr'
435 extra_boot_args_options = (435 extra_boot_args_options = (
436 'earlyprintk mpurate=500 vram=12M '436 'earlyprintk mpurate=${mpurate} vram=12M')
437 'omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi')
438437
439438
440class PandaConfig(OmapConfig):439class PandaConfig(OmapConfig):
@@ -914,7 +913,7 @@
914def make_boot_script(boot_env, boot_script_path):913def make_boot_script(boot_env, boot_script_path):
915 boot_script_data = (914 boot_script_data = (
916 "setenv bootcmd '%(bootcmd)s'\n"915 "setenv bootcmd '%(bootcmd)s'\n"
917 "setenv bootargs '%(bootargs)s'\n"916 "setenv bootargs %(bootargs)s\n"
918 "boot"917 "boot"
919 % boot_env)918 % boot_env)
920919
921920
=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py 2011-05-20 08:24:17 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py 2011-05-20 15:38:39 +0000
@@ -497,9 +497,7 @@
497 expected = {497 expected = {
498 'bootargs': 'console=tty0 console=ttyO2,115200n8 '498 'bootargs': 'console=tty0 console=ttyO2,115200n8 '
499 'root=UUID=deadbeef rootwait ro earlyprintk '499 'root=UUID=deadbeef rootwait ro earlyprintk '
500 'mpurate=500 vram=12M '500 'mpurate=${mpurate} vram=12M',
501 'omapfb.mode=dvi:1024x768MR-16@60 '
502 'omapdss.def_disp=dvi',
503 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '501 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
504 'fatload mmc 0:1 0x81600000 uInitrd; '502 'fatload mmc 0:1 0x81600000 uInitrd; '
505 'fatload mmc 0:1 0x815f0000 board.dtb; '503 'fatload mmc 0:1 0x815f0000 board.dtb; '

Subscribers

People subscribed via source and target branches