Linaro Image Tools

Merge lp:~lool/linaro-image-tools/share-omap into lp:linaro-image-tools/11.11

  1. share-omap
  2. Merge into trunk
Proposed by Loïc Minier
Status: Merged
Approved by: James Westby
Approved revision: 293
Merged at revision: 294
Proposed branch: lp:~lool/linaro-image-tools/share-omap
Merge into: lp:linaro-image-tools/11.11
Diff against target: 35 lines (+1/-3)
1 file modified
linaro_media_create/boards.py (+1/-3)
To merge this branch: bzr merge lp:~lool/linaro-image-tools/share-omap
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+52311@code.launchpad.net

Description of the change

Set kernel_suffix = 'linaro-omap' in OmapConfig instead of children classes.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_media_create/boards.py'
2--- linaro_media_create/boards.py 2011-03-03 13:44:11 +0000
3+++ linaro_media_create/boards.py 2011-03-05 22:27:29 +0000
4@@ -203,6 +203,7 @@
5
6
7 class OmapConfig(BoardConfig):
8+ kernel_suffix = 'linaro-omap'
9 uboot_in_boot_part = True
10
11 # XXX: Here we define these things as dynamic properties because our
12@@ -276,7 +277,6 @@
13 kernel_addr = '0x80000000'
14 initrd_addr = '0x81600000'
15 load_addr = '0x80008000'
16- kernel_suffix = 'linaro-omap'
17 boot_script = 'boot.scr'
18 extra_boot_args_options = (
19 'earlyprintk fixrtc nocompcache vram=12M '
20@@ -290,7 +290,6 @@
21 kernel_addr = '0x80000000'
22 initrd_addr = '0x81600000'
23 load_addr = '0x80008000'
24- kernel_suffix = 'linaro-omap'
25 boot_script = 'boot.scr'
26 extra_boot_args_options = (
27 'earlyprintk mpurate=500 vram=12M '
28@@ -305,7 +304,6 @@
29 kernel_addr = '0x80200000'
30 initrd_addr = '0x81600000'
31 load_addr = '0x80008000'
32- kernel_suffix = 'linaro-omap'
33 boot_script = 'boot.scr'
34 extra_boot_args_options = (
35 'earlyprintk fixrtc nocompcache vram=32M '

Subscribers

People subscribed via source and target branches