From patchwork Fri Nov 21 13:17:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41304 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E6027244B0 for ; Fri, 21 Nov 2014 13:18:43 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf3314193eek.11 for ; Fri, 21 Nov 2014 05:18:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=8JYjcV0Mu7QD9nb78NHxJDWnA8noshQbnWttP/PJVLQ=; b=cjocRKLJpkYfD5XtaTIEPfTWQ/2kTRAAOq8JHSQnNj6Zc9MaquUpEKAn/mbtEIQqfe dLTnzxvBfdSbzYM4ujdzSYGvVE8ugo5wxuKRlrAmv+WawaJ8r8khqfguIznhVnjl/WVy rLlAuMr3KquSdTTpFvPz8Rp7uvN6qag8ALpqeUGbaBXIhHuoM5lEhYMnogzjPxw9eciH t6GjODMejsIvW/MC7bBD1ys81+XJI1d7Ps6fAowu5hR5D1Sel5lrgwQU3JHQNQ52CSw+ Smz7bdl1LqDkKiDzG9cnaaxSFPm8fe7I0geZpCcL6wGXKeWEu9x8I/721lonl1dvaXIB yFtQ== X-Gm-Message-State: ALoCoQk8Q9AufdPCvYlycNvQWv8dYpeL68533dqQUOdazeQcFX1FDdp89A3qnkgZr2+Ws3vj9Uce X-Received: by 10.194.178.163 with SMTP id cz3mr1552663wjc.1.1416575921999; Fri, 21 Nov 2014 05:18:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.41 with SMTP id q9ls156320lag.67.gmail; Fri, 21 Nov 2014 05:18:41 -0800 (PST) X-Received: by 10.152.120.167 with SMTP id ld7mr4347648lab.77.1416575921619; Fri, 21 Nov 2014 05:18:41 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id y9si5265860lbw.115.2014.11.21.05.18.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id s18so4256518lam.1 for ; Fri, 21 Nov 2014 05:18:40 -0800 (PST) X-Received: by 10.152.9.7 with SMTP id v7mr4554914laa.40.1416575920702; Fri, 21 Nov 2014 05:18:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp87142lbc; Fri, 21 Nov 2014 05:18:39 -0800 (PST) X-Received: by 10.140.37.71 with SMTP id q65mr6372696qgq.42.1416575915564; Fri, 21 Nov 2014 05:18:35 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id u18si6705722qah.40.2014.11.21.05.18.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:18:35 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5Q-0007J5-1y; Fri, 21 Nov 2014 13:17:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5P-0007IL-4D for xen-devel@lists.xen.org; Fri, 21 Nov 2014 13:17:19 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 4A/49-02576-E5B3F645; Fri, 21 Nov 2014 13:17:18 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1416575829!13439228!5 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5222 invoked from network); 21 Nov 2014 13:17:17 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Nov 2014 13:17:17 -0000 X-IronPort-AV: E=Sophos;i="5.07,431,1413244800"; d="scan'208";a="195229198" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 21 Nov 2014 08:17:16 -0500 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xro5L-0003Ay-Av; Fri, 21 Nov 2014 13:17:16 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 21 Nov 2014 13:17:15 +0000 From: Ian Campbell To: Date: Fri, 21 Nov 2014 13:17:00 +0000 Message-ID: <1416575824-15555-11-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1416505070.26869.2.camel@citrix.com> References: <1416505070.26869.2.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v3 11/15] Osstest/Debian: Remove hardcoded midway specific addresses from boot.scr X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This depends on a change to the hostdb to add "0x01000000" as the value of a new UBootSetXenAddrR property of the midway machines. Most platforms will need something similar. For both cubietruck and arndale 0x41000000. Signed-off-by: Ian Campbell --- v3: Move the property to a specific one like I was supposed to last time v2: s/go along with/depends on/ --- Osstest/Debian.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index bdbb55d..0f92661 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -140,9 +140,13 @@ sub setupboot_uboot ($$$) { logm("Linux options: $xenkopt"); my $early_commands = get_host_property($ho, 'UBootScriptEarlyCommands', ''); + my $xen_addr_r = get_host_property($ho, 'UBootSetXenAddrR', undef); my $load_dtb = uboot_scr_load_dtb(); + my $set_xen_addr_r = + $xen_addr_r ? "setenv xen_addr_r $xen_addr_r" : ""; + target_cmd_root($ho, < fdt set /chosen \\\#size-cells <1> -setenv xen_addr_r 0x01000000 -# kernel_addr_r=0x02000000 -# ramdisk_addr_r=0x04000000 - ext2load scsi 0 \\\${xen_addr_r} \$xen setenv bootargs "$xenhopt" echo Loaded \$xen to \\\${xen_addr_r} (\\\${filesize})