From patchwork Fri Aug 16 08:02:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 19210 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f200.google.com (mail-ye0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 39601248E6 for ; Fri, 16 Aug 2013 08:02:30 +0000 (UTC) Received: by mail-ye0-f200.google.com with SMTP id r14sf896235yen.3 for ; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=WClKrUAq0SDmsJsm02pLLm9pI2kDxkc3Pt/qfhG+BAs=; b=bPKRmHqqQN7LzoC29ume6SlJMUUwMj4r8krfvNrxICBg1mNqpgzM4iK0onlEaUyqtg J0SaN+Up6+i0z7df01nIG2MX6MVA8/2di+vSuFp8cfMxAC6++kS6JJyIrkDZUI6PQTMp E75kezAmaEogwj2aa1+8B4HRpTc/itSyQq4iY4FaIvV6qHuMgmJTHNM5FnUxU/YMof2Y 7k/1bkwbuR1cma4Po9bUEpP73TZ0GT4ID7GSoGVUoxXbV+gqhgYQoRuR2cCXY8DHTIjK QDxY6jPF5rGv3alUw658jSokS+13d5B6BCYLwEyKvBc6PDhkfWTd1gz3zDEv8NJqyk31 EdFQ== X-Received: by 10.236.185.230 with SMTP id u66mr135481yhm.42.1376640149873; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.244 with SMTP id d20ls711383qey.38.gmail; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-Received: by 10.58.108.8 with SMTP id hg8mr123028veb.6.1376640149733; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id uf1si81395vcb.7.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 01:02:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id gf11so1249746vcb.11 for ; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-Gm-Message-State: ALoCoQmz/UrKtsyIjWoVCZ4fovmK4DXcV3X2VdMMy+iPLUxw/Y5B0OTfHnpBTV4VlA6FaHe+6APx X-Received: by 10.220.46.72 with SMTP id i8mr121433vcf.10.1376640149566; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp56105vcz; Fri, 16 Aug 2013 01:02:29 -0700 (PDT) X-Received: by 10.14.5.78 with SMTP id 54mr387515eek.55.1376640148627; Fri, 16 Aug 2013 01:02:28 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o6si358391eea.39.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Aug 2013 01:02:28 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VAEzL-0004F8-TF for ; Fri, 16 Aug 2013 08:02:27 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CF7FEE039A for ; Fri, 16 Aug 2013 08:02:27 +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: 635 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 635: Added Fujitsu AA9 board support. Message-Id: <20130816080227.21871.99267.launchpad@ackee.canonical.com> Date: Fri, 16 Aug 2013 08:02:27 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16723"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 9b585f2eb69b33977a1a11c96776a0a7669d87fc X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Fathi Boudra (fboudra) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/aa9-support/+merge/180477 proposed by: Fathi Boudra (fboudra) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 635 [merge] author: Fathi Boudra committer: Milo Casagrande branch nick: trunk timestamp: Fri 2013-08-16 10:01:22 +0200 message: Added Fujitsu AA9 board support. 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 2013-08-06 10:09:32 +0000 +++ linaro_image_tools/media_create/boards.py 2013-08-16 08:01:22 +0000 @@ -1727,6 +1727,20 @@ self.load_addr = '0x00000000' +class Aa9Config(BoardConfig): + def __init__(self): + super(Aa9Config, self).__init__() + self.boot_script = 'boot.scr' + self.bootloader_flavor = 'mb8ac0300eb' + self.kernel_flavors = None + self._serial_tty = 'ttyS0' + self.dtb_addr = '0x41000000' + self.initrd_addr = '0x41100000' + self.kernel_addr = '0x40000000' + self.load_addr = '0x40008000' + self._extra_serial_options = 'console=ttyS0,115200n8' + + class I386Config(BoardConfig): # define bootloader BOOTLOADER_CMD = 'grub-install' @@ -1793,6 +1807,7 @@ board_configs = { + 'aa9': Aa9Config, 'arndale': ArndaleConfig, 'beagle': BeagleConfig, 'beaglebone': BeagleBoneConfig, === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2013-08-08 07:34:16 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2013-08-16 08:01:22 +0000 @@ -1440,6 +1440,12 @@ 'make_dtb', 'make_boot_script', 'make_boot_ini'] self.assertEqual(expected, self.funcs_calls) + def test_aa9_steps(self): + board_conf = boards.Aa9Config() + board_conf.hwpack_format = HardwarepackHandler.FORMAT_1 + expected = [] + self.assertEqual(expected, self.funcs_calls) + class TestPopulateRawPartition(TestCaseWithFixtures): @@ -1571,6 +1577,11 @@ expected = [] self.assertEqual(expected, self.funcs_calls) + def test_aa9_raw(self): + self.populate_raw_partition(boards.Aa9Config()) + expected = [] + self.assertEqual(expected, self.funcs_calls) + class TestPopulateRawPartitionAndroid(TestCaseWithFixtures): @@ -1878,10 +1889,17 @@ board_conf.get_sfdisk_cmd()) def test_beaglebone(self): - board_conf = get_board_config('highbank') - self.set_up_config(board_conf) - self.assertEquals( - '63,106432,0x83,*\n106496,,,-', + board_conf = get_board_config('beaglebone') + self.set_up_config(board_conf) + self.assertEquals( + '63,106432,0x0C,*\n106496,,,-', + board_conf.get_sfdisk_cmd()) + + def test_aa9(self): + board_conf = get_board_config('aa9') + self.set_up_config(board_conf) + self.assertEquals( + '63,106432,0x0C,*\n106496,,,-', board_conf.get_sfdisk_cmd()) def test_panda_android(self): @@ -2013,6 +2031,13 @@ '63,106432,0x0C,*\n106496,,,-', board_conf.get_sfdisk_cmd()) + def test_aa9(self): + board_conf = get_board_config('aa9') + board_conf.partition_layout = 'bootfs_rootfs' + self.assertEquals( + '63,106432,0x0C,*\n106496,,,-', + board_conf.get_sfdisk_cmd()) + class TestGetBootCmd(TestCase): @@ -2291,6 +2316,24 @@ 'initrd_high': '0xffffffff'} self.assertEqual(expected, boot_commands) + def test_aa9(self): + config = get_board_config('aa9') + config.serial_tty = config._serial_tty + boot_commands = config._get_boot_env( + is_live=False, is_lowmem=False, consoles=[], + rootfs_id="UUID=deadbeef", i_img_data="initrd", + d_img_data="board.dtb") + expected = { + 'bootargs': 'console=ttyS0,115200n8 ' + 'root=UUID=deadbeef rootwait ro', + 'bootcmd': 'fatload mmc 0:1 0x40000000 uImage; ' + 'fatload mmc 0:1 0x41100000 uInitrd; ' + 'fatload mmc 0:1 0x41000000 board.dtb; ' + 'bootm 0x40000000 0x41100000 0x41000000', + 'fdt_high': '0xffffffff', + 'initrd_high': '0xffffffff'} + self.assertEqual(expected, boot_commands) + class TestExtraBootCmd(TestCaseWithFixtures):