From patchwork Thu Sep 20 09:04:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgy Redkozubov X-Patchwork-Id: 11525 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2DDCE2410F for ; Thu, 20 Sep 2012 09:04:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9AA673D0948C for ; Thu, 20 Sep 2012 09:04:12 +0000 (UTC) Received: by iafj25 with SMTP id j25so1459000iaf.11 for ; Thu, 20 Sep 2012 02:04:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=ZvzCoifxMZ3dCGoUJNNQsIFdOLJdT5dxwcRbBQlMu4E=; b=Vy8ybX1HYH7dMItKolAW5YHZA6Ogf9CNKLLtYsjU2qdqR7doQKR06mMWsGPjZHlmeu lEm7aMzuACKiDyG98fZhOCysxRM0i7NoX7a6qGpAPM3FE3KWRJOZov3kbyYr3/MyCO6p R7mTec0axVrS6i3zC15xMeV/qEFdWhYmjx8rsrKx/OA+fpbbcnq86lJkzVRJOW+Anwu4 iwm77VNUeziA2QYv/njSsrNBXr4UN15k0xtF0oaVeNRKNB+8PCGuhoYUdr0ofMaG7CpP PJDp01S3KQyFgfrkeLPSpv2d3R6kMc2SUwf3ccQLmpfnhabjyQFCC1GphIljajbxZYjz Af3Q== Received: by 10.50.217.229 with SMTP id pb5mr1055607igc.28.1348131851954; Thu, 20 Sep 2012 02:04:11 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp64607igc; Thu, 20 Sep 2012 02:04:11 -0700 (PDT) Received: by 10.180.94.164 with SMTP id dd4mr4509606wib.1.1348131850562; Thu, 20 Sep 2012 02:04:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n12si12652476wiw.7.2012.09.20.02.04.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 02:04:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1TEcg5-0004nM-Uo for ; Thu, 20 Sep 2012 09:04:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id DD2F8E18F7 for ; Thu, 20 Sep 2012 09:04:09 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 562 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 562: [merge] Added support for device tree for Android on Snowball. Message-Id: <20120920090409.31270.31898.launchpad@ackee.canonical.com> Date: Thu, 20 Sep 2012 09:04:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15985"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0cda9bca3ce5c7dd519e323b4d541164ea25bcf4 X-Gm-Message-State: ALoCoQlVHMkeTqSWHRTM2G6q6X4XFkCM+NLIMq6AsRUB+jFj/9HfWsr8Zdz6gn47Km+9/6UDLTMI Merge authors: Patrik Ryd (patrik-ryd) Related merge proposals: https://code.launchpad.net/~patrik-ryd/linaro-image-tools/linaro-image-tools/+merge/124623 proposed by: Patrik Ryd (patrik-ryd) review: Approve - Georgy Redkozubov (gesha) review: Approve - Deepti B. Kalakeri (deeptik) ------------------------------------------------------------ revno: 562 [merge] committer: Georgy Redkozubov branch nick: lit-trunk timestamp: Thu 2012-09-20 13:03:00 +0400 message: [merge] Added support for device tree for Android on Snowball. modified: linaro_image_tools/media_create/android_boards.py linaro_image_tools/media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/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-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2012-08-05 09:22:09 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-09-20 08:08:10 +0000 @@ -210,7 +210,8 @@ 'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=500M') _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' - dtb_name = None + dtb_name = 'board.dtb' + dtb_addr = '0x8000000' class AndroidSnowballEmmcConfig(AndroidBoardConfig, SnowballEmmcConfig): @@ -222,7 +223,8 @@ _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' mmc_option = '0:2' - dtb_name = None + dtb_name = 'board.dtb' + dtb_addr = '0x8000000' @classmethod def get_sfdisk_cmd(cls, should_align_boot_part=False): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-09-10 17:50:26 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-09-20 08:19:28 +0000 @@ -1970,7 +1970,8 @@ 'vmalloc=500M init=/init androidboot.console=ttyAMA2', 'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; ' 'fatload mmc 1:1 0x05000000 uInitrd; ' - 'bootm 0x00100000 0x05000000'} + 'fatload mmc 1:1 0x8000000 board.dtb; ' + 'bootm 0x00100000 0x05000000 0x8000000'} self.assertBootEnv( android_boards.AndroidSnowballSdConfig, expected) @@ -1983,7 +1984,8 @@ 'vmalloc=500M init=/init androidboot.console=ttyAMA2', 'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; ' 'fatload mmc 0:2 0x05000000 uInitrd; ' - 'bootm 0x00100000 0x05000000'} + 'fatload mmc 0:2 0x8000000 board.dtb; ' + 'bootm 0x00100000 0x05000000 0x8000000'} self.assertBootEnv( android_boards.AndroidSnowballEmmcConfig, expected)