From patchwork Wed Aug 14 22:43:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 19159 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 00BAE246B8 for ; Wed, 14 Aug 2013 22:43:34 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id a11sf67206qen.11 for ; Wed, 14 Aug 2013 15:43:34 -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=VL+7FX7I098fSMZhDT9symfZx76zk3U48Oseu9YMlf4=; b=Ej/OXBJhnfJTcO/px0aUJwyPsOoOOlxuvcM7reisqgEtr2UYUByzl8lCDNUbuYonb5 LhSHXMm2Q6fR2PM2mzALA7g9DMNU/C11Ycc7MfYnGkU6vlQqkFjQAr38bAKC2BZov9WJ LH/VoRzPGa2x4CITNhF2xQMohEZ6ZWCHFH7+Vh3xdqJwHpk81BQtAowtKFpsEYq4iNua Ma+wmiXCc9ffsKhmOUnRw4/Lzpy00ceGjBLVyDHYqWMa245LCMkb7rY7wWxMI7ZAGyIw qQMKWjMGFDx6aC8QgOaLOmV2Qgu++v/tTU/3K6mRI21nyQXri7pXi3LhtLnUa1qyGEvU vW3w== X-Received: by 10.58.49.3 with SMTP id q3mr3577028ven.26.1376520214329; Wed, 14 Aug 2013 15:43:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.95.138 with SMTP id dk10ls104140qeb.23.gmail; Wed, 14 Aug 2013 15:43:34 -0700 (PDT) X-Received: by 10.58.219.232 with SMTP id pr8mr150165vec.80.1376520214141; Wed, 14 Aug 2013 15:43:34 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id q4si10407336vce.49.2013.08.14.15.43.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 15:43:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so48448vbe.41 for ; Wed, 14 Aug 2013 15:43:33 -0700 (PDT) X-Gm-Message-State: ALoCoQnXKwAKp91TY1eyvg4Y5h5OgNAXrMnVEuSFh3dRoCm6bOV1yShcUTNigX7QBWuSWQA2vDCH X-Received: by 10.221.44.136 with SMTP id ug8mr11618496vcb.13.1376520213946; Wed, 14 Aug 2013 15:43:33 -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 u4csp239148vcz; Wed, 14 Aug 2013 15:43:33 -0700 (PDT) X-Received: by 10.15.67.131 with SMTP id u3mr17410188eex.34.1376520212714; Wed, 14 Aug 2013 15:43:32 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id z6si13780159eey.133.2013.08.14.15.43.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 14 Aug 2013 15:43:32 -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 1V9jmu-0001Do-1q for ; Wed, 14 Aug 2013 22:43:32 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id F41FBEB82E for ; Wed, 14 Aug 2013 22:43:31 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 647 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 647: More device-type cleanup Message-Id: <20130814224331.26480.41495.launchpad@ackee.canonical.com> Date: Wed, 14 Aug 2013 22:43:31 -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: 9c559eb8e8267369d4d7981d36d4c58eceade966 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.212.54 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: , ------------------------------------------------------------ revno: 647 committer: Tyler Baker branch nick: lava-dispatcher timestamp: Wed 2013-08-14 15:42:41 -0700 message: More device-type cleanup modified: lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2013-05-23 17:51:36 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2013-08-14 22:42:41 +0000 @@ -94,7 +94,7 @@ interrupt_boot_command = "" # The string to look for to know that the boot process has begun -image_boot_msg = Uncompressing Linux +image_boot_msg = Booting Linux # The character the boot loader uses as a prompt on this board. bootloader_prompt = # === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf 2013-08-14 21:48:44 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf 2013-08-14 22:42:41 +0000 @@ -22,6 +22,7 @@ qemu_machine_type = beaglexm lmc_dev_arg = beagle +bootloader_prompt = OMAP3 beagleboard.org boot_options = boot_cmds === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf 2013-08-14 19:54:58 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf 2013-08-14 22:42:41 +0000 @@ -32,6 +32,8 @@ lmc_dev_arg = beaglebone +bootloader_prompt = U-Boot + boot_options = boot_cmds === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf 2013-08-14 19:54:58 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf 2013-08-14 22:42:41 +0000 @@ -31,6 +31,8 @@ lmc_dev_arg = beaglebone +bootloader_prompt = U-Boot + boot_options = boot_cmds === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf 2013-08-14 21:48:44 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf 2013-08-14 22:42:41 +0000 @@ -1,6 +1,7 @@ client_type = bootloader boot_part = 2 root_part = 3 +testboot_offset = 3 boot_cmds = mmc init, mmc part 0, setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'", @@ -25,7 +26,7 @@ setenv bootargs "'console=ttySAC2,115200n8 rootwait ro init=/init androidboot.console=ttySAC2'", boot -bootloader_prompt = # +bootloader_prompt = ORIGEN lmc_dev_arg = origen === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2013-08-14 21:48:44 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2013-08-14 22:42:41 +0000 @@ -60,6 +60,8 @@ # changed to /mnt/sdcard in http://review.android.git.linaro.org/#change,3213 sdcard_mountpoint_path = /mnt/sdcard +bootloader_prompt = Panda + boot_options = boot_cmds === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-08-14 21:48:44 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-08-14 22:42:41 +0000 @@ -1,18 +1,26 @@ client_type = bootloader -boot_cmds = mmc rescan 0, - setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; + +boot_device = 1 + +boot_cmds = mmc rescan 1, + setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; bootm 0x00100000'", - setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M - root=/dev/mmcblk0p5 rootwait mem=128M@0 mali.mali_mem=32M@128M + setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M + root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'", boot -boot_cmds_android = mmc rescan 0, - setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'", +boot_cmds_android = mmc rescan 1, + setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage'", setenv bootargs "'console=ttyAMA2,115200n8 rootwait ro earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=500M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'", boot + +boot_cmds_fdt = mmc rescan 1, + setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fatload mmc 1:3 0x01000000 /uInitrd; fatload mmc 1:3 0x00f00000 /board.dtb; bootm 0x00100000 0x01000000 0x00f00000'" + setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 rootwait ro fixrtc nocompcache vmalloc=300M mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'", + boot -bootloader_prompt = $ +bootloader_prompt = U8500 lmc_dev_arg = snowball_sd @@ -23,8 +31,8 @@ echo 0x01 > /sys/kernel/debug/ab8500/register-address echo 0x11 > /sys/kernel/debug/ab8500/register-value -android_orig_block_device = mmcblk0 -android_lava_block_device = mmcblk0 +android_orig_block_device = mmcblk1 +android_lava_block_device = mmcblk1 boot_options = boot_cmds