From patchwork Tue Mar  8 15:18:28 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= <lool@dooz.org>
X-Patchwork-Id: 441
Return-Path: <bounces@canonical.com>
Delivered-To: unknown
Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6
 with IMAP4-SSL; 08 Jun 2011 14:42:40 -0000
Delivered-To: patches@linaro.org
Received: by 10.224.60.68 with SMTP id o4cs31307qah;
 Tue, 8 Mar 2011 07:18:29 -0800 (PST)
Received: by 10.227.179.69 with SMTP id bp5mr4583882wbb.192.1299597509080;
 Tue, 08 Mar 2011 07:18:29 -0800 (PST)
Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139])
 by mx.google.com with ESMTP id b20si1197828wbb.22.2011.03.08.07.18.28;
 Tue, 08 Mar 2011 07:18:29 -0800 (PST)
Received-SPF: pass (google.com: best guess record for domain of
 bounces@canonical.com designates 91.189.90.139 as permitted
 sender) client-ip=91.189.90.139; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: best guess record for domain
 of bounces@canonical.com designates 91.189.90.139 as
 permitted sender) smtp.mail=bounces@canonical.com
Received: from loganberry.canonical.com ([91.189.90.37])
 by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian))
 id 1Pwyg8-0008Ov-IH
 for <patches@linaro.org>; Tue, 08 Mar 2011 15:18:28 +0000
Received: from loganberry.canonical.com (localhost [127.0.0.1])
 by loganberry.canonical.com (Postfix) with ESMTP id 86D8F2E88B1
 for <patches@linaro.org>; Tue,  8 Mar 2011 15:18:28 +0000 (UTC)
MIME-Version: 1.0
X-Launchpad-Project: linaro-image-tools
X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk
X-Launchpad-Message-Rationale: Subscriber
X-Launchpad-Branch-Revision-Number: 294
X-Launchpad-Notification-Type: branch-revision
To: Linaro Patch Tracker <patches@linaro.org>
From: noreply@launchpad.net
Subject: [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>
Date: Tue, 08 Mar 2011 15:18:28 -0000
Reply-To: noreply@launchpad.net
Sender: bounces@canonical.com
Errors-To: bounces@canonical.com
Precedence: bulk
X-Generated-By: Launchpad (canonical.com); Revision="12532";
 Instance="initZopeless config overlay"
X-Launchpad-Hash: aa6d0049f0ff16de7b900015c85e7717f014b1f7

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

=== 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 '