From patchwork Wed Nov 23 14:23:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: loic.minier@linaro.org X-Patchwork-Id: 5297 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 6F81323E0C for ; Wed, 23 Nov 2011 14:23:21 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 1DE5DA1835B for ; Wed, 23 Nov 2011 14:23:21 +0000 (UTC) Received: by ywb5 with SMTP id 5so1892688ywb.11 for ; Wed, 23 Nov 2011 06:23:20 -0800 (PST) Received: by 10.152.144.136 with SMTP id sm8mr14670876lab.33.1322058200112; Wed, 23 Nov 2011 06:23:20 -0800 (PST) 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.152.41.198 with SMTP id h6cs232925lal; Wed, 23 Nov 2011 06:23:19 -0800 (PST) Received: by 10.152.106.115 with SMTP id gt19mr14721618lab.27.1322058197660; Wed, 23 Nov 2011 06:23:17 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id nt5si9733662lab.0.2011.11.23.06.23.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Nov 2011 06:23:17 -0800 (PST) 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 1RTDjI-0006mK-R0 for ; Wed, 23 Nov 2011 14:23:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C3F13E17CF for ; Wed, 23 Nov 2011 14:23:16 +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: 469 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 469: Merge lp:~tixy/linaro-image-tools/vexpress-uboot-addresses-fix; fixes load Message-Id: <20111123142316.6336.68961.launchpad@ackee.canonical.com> Date: Wed, 23 Nov 2011 14:23:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14336"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 25270f238bb9b63a0fdec225ea8edadd9d047a8f Merge authors: Tixy (Jon Medhurst) (tixy) Related merge proposals: https://code.launchpad.net/~tixy/linaro-image-tools/vexpress-uboot-addresses-fix/+merge/83167 proposed by: Tixy (Jon Medhurst) (tixy) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 469 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Wed 2011-11-23 15:14:58 +0100 message: Merge lp:~tixy/linaro-image-tools/vexpress-uboot-addresses-fix; fixes load addresses on vexpress. modified: linaro_image_tools/media_create/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/boards.py' --- linaro_image_tools/media_create/boards.py 2011-11-21 14:34:49 +0000 +++ linaro_image_tools/media_create/boards.py 2011-11-23 12:49:03 +0000 @@ -1265,9 +1265,9 @@ serial_tty = 'ttyAMA0' _extra_serial_opts = 'console=tty0 console=%s,38400n8' _live_serial_opts = 'serialtty=%s' - kernel_addr = '0x60008000' - initrd_addr = '0x81000000' - load_addr = kernel_addr + kernel_addr = '0x60000000' + initrd_addr = '0x62000000' + load_addr = '0x60008000' kernel_flavors = ['linaro-vexpress'] boot_script = 'boot.scr' # ARM Boot Monitor is used to load u-boot, uImage etc. into flash and === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-11-21 14:34:49 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-11-23 12:49:03 +0000 @@ -1232,9 +1232,9 @@ expected = { 'bootargs': 'console=tty0 console=ttyAMA0,38400n8 ' 'console=ttyXXX root=UUID=deadbeef rootwait ro', - 'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; ' - 'fatload mmc 0:1 0x81000000 uInitrd; ' - 'bootm 0x60008000 0x81000000'} + 'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; ' + 'fatload mmc 0:1 0x62000000 uInitrd; ' + 'bootm 0x60000000 0x62000000'} self.assertEqual(expected, boot_commands) def test_vexpress_a9(self): @@ -1244,9 +1244,9 @@ expected = { 'bootargs': 'console=tty0 console=ttyAMA0,38400n8 ' 'console=ttyXXX root=UUID=deadbeef rootwait ro', - 'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; ' - 'fatload mmc 0:1 0x81000000 uInitrd; ' - 'bootm 0x60008000 0x81000000'} + 'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; ' + 'fatload mmc 0:1 0x62000000 uInitrd; ' + 'bootm 0x60000000 0x62000000'} self.assertEqual(expected, boot_commands) def test_mx51(self): @@ -1467,9 +1467,9 @@ expected = { 'bootargs': 'console=tty0 console=ttyAMA0,38400n8 ' 'rootwait ro init=/init androidboot.console=ttyAMA0', - 'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; ' - 'fatload mmc 0:1 0x81000000 uInitrd; ' - 'bootm 0x60008000 0x81000000'} + 'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; ' + 'fatload mmc 0:1 0x62000000 uInitrd; ' + 'bootm 0x60000000 0x62000000'} self.assertEqual(expected, boot_commands)