diff mbox

[Branch,~linaro-maintainers/linaro-image-tools/trunk] Rev 294: Merge lp:~lool/linaro-image-tools/share-omap; set kernel_suffix = 'linaro-omap'

Message ID 20110308151828.24523.82179.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Loïc Minier March 8, 2011, 3:18 p.m. UTC
Merge authors:
  Loïc Minier (lool)
Related merge proposals:
  https://code.launchpad.net/~lool/linaro-image-tools/share-omap/+merge/52311
  proposed by: Loïc Minier (lool)
  review: Approve - James Westby (james-w)
------------------------------------------------------------
revno: 294 [merge]
committer: Loïc Minier <lool@dooz.org>
branch nick: linaro-image-tools
timestamp: Tue 2011-03-08 16:15:39 +0100
message:
  Merge lp:~lool/linaro-image-tools/share-omap; set kernel_suffix = 'linaro-omap'
  in OmapConfig instead of children classes.
modified:
  linaro_media_create/boards.py


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

Patch

=== modified file 'linaro_media_create/boards.py'
--- linaro_media_create/boards.py	2011-03-08 15:13:56 +0000
+++ linaro_media_create/boards.py	2011-03-08 15:15:39 +0000
@@ -203,6 +203,7 @@ 
 
 
 class OmapConfig(BoardConfig):
+    kernel_suffix = 'linaro-omap'
     uboot_in_boot_part = True
 
     # XXX: Here we define these things as dynamic properties because our
@@ -276,7 +277,6 @@ 
     kernel_addr = '0x80000000'
     initrd_addr = '0x81600000'
     load_addr = '0x80008000'
-    kernel_suffix = 'linaro-omap'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=12M '
@@ -290,7 +290,6 @@ 
     kernel_addr = '0x80000000'
     initrd_addr = '0x81600000'
     load_addr = '0x80008000'
-    kernel_suffix = 'linaro-omap'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk mpurate=500 vram=12M '
@@ -305,7 +304,6 @@ 
     kernel_addr = '0x80200000'
     initrd_addr = '0x81600000'
     load_addr = '0x80008000'
-    kernel_suffix = 'linaro-omap'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=32M '