From patchwork Mon Nov 10 14:10: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: 40490 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CCC3A244B0 for ; Mon, 10 Nov 2014 14:11:58 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf5214980lab.1 for ; Mon, 10 Nov 2014 06:11:57 -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:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=pTPoN2Zl2HMuMjkFaa6kGXhFYT/qXusIqdqMtPh5+Ok=; b=T9H4ItVAsLW4B4m7OMC6rMB2HT4BpukvsFVMyTFsFDHoW6nWOk+iA0mGVMb0kAgJ3H ZNe/+TzUQOsE04u52qYnTcTlNeDHUSe7xfK2j75lau7aUCll57moIeMUxbz58ihfaly5 IX6pKk1peyTCB0u6wfc6S6ekJA5nVj27heh87d9VLLlS7Vz5vdVa0ay/eOPjWs+WLIgA pMaQFz3ifTHhI9L1U0euN7aN9F077LfZd7JgTaqUqst/+lN4rAIJxF9phTcK9BOWnmkz uuINme9TDd/BJotHcwMEzD/iqEbqtuHxTFKMrIOZBrpBWinKsZZZrZcujDEWJpfedMOR qtsg== X-Gm-Message-State: ALoCoQnKoh99cD95+LUHjwPAMy5FQVYVv2NacmtnzUmtbeBBMk+CnTLt4dyQ8WDaw2RA5nKgtnv0 X-Received: by 10.194.61.243 with SMTP id t19mr557501wjr.5.1415628715477; Mon, 10 Nov 2014 06:11:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.97 with SMTP id s1ls470768lag.81.gmail; Mon, 10 Nov 2014 06:11:55 -0800 (PST) X-Received: by 10.152.88.1 with SMTP id bc1mr2398117lab.96.1415628715282; Mon, 10 Nov 2014 06:11:55 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ka2si27352746lbc.9.2014.11.10.06.11.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 06:11:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id 10so5935157lbg.35 for ; Mon, 10 Nov 2014 06:11:55 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr29099175lab.67.1415628715189; Mon, 10 Nov 2014 06:11:55 -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 ew9csp92923lbc; Mon, 10 Nov 2014 06:11:54 -0800 (PST) X-Received: by 10.52.227.234 with SMTP id sd10mr4211925vdc.28.1415628713886; Mon, 10 Nov 2014 06:11:53 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id u93si31134109qge.73.2014.11.10.06.11.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Nov 2014 06:11:53 -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 1XnpfV-0006G7-D1; Mon, 10 Nov 2014 14:10:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnpfV-0006Fj-0N for xen-devel@lists.xen.org; Mon, 10 Nov 2014 14:10:09 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 4F/B4-26740-047C0645; Mon, 10 Nov 2014 14:10:08 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1415628606!11619188!1 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 32462 invoked from network); 10 Nov 2014 14:10:07 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2014 14:10:07 -0000 X-IronPort-AV: E=Sophos;i="5.07,353,1413244800"; d="scan'208";a="191187511" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 10 Nov 2014 09:10:04 -0500 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XnpfP-0006Jz-Js; Mon, 10 Nov 2014 14:10:04 +0000 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 10 Nov 2014 14:10:03 +0000 From: Ian Campbell To: , Christoffer Dall Date: Mon, 10 Nov 2014 14:10:00 +0000 Message-ID: <1415628601-31075-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 3/4] Select correct dom0 console depending on whether Xen is enabled or not 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.217.176 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: Signed-off-by: Ian Campbell --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2f31fab..d292f4d 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,8 @@ AC_ARG_WITH([initrd], AC_SUBST([FILESYSTEM], [$USE_INITRD]) AM_CONDITIONAL([INITRD], [test "x$USE_INITRD" != "x"]) -C_CMDLINE="console=ttyAMA0 earlyprintk=pl011,0x1c090000" +AS_IF([test "x$XEN_IMAGE" = "no"],[C_CONSOLE="ttyAMA0"],[C_CONSOLE="hvc0"]) +C_CMDLINE="console=$C_CONSOLE earlyprintk=pl011,0x1c090000" AC_ARG_WITH([cmdline], AS_HELP_STRING([--with-cmdline], [set a command line for the kernel]), [C_CMDLINE=$withval])